From 4e14bbb31b7cedb3a92b8e2b8f669b1233aa059b Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 17 Nov 2006 12:29:21 -0200 Subject: [PATCH] --- yaml --- r: 41743 b: refs/heads/master c: c66b721a502cbbc15be8bd7c79c305fa40f1e6ce h: refs/heads/master i: 41741: b23e4aa475f059cefcc6f3c59f3a6b7c3260692a 41739: 3c80d91d9e02607be696cacdc5a0753b3d09c550 41735: 792931c162162987a3dc59d7b6a6dad01ec98b20 41727: 2ceaff97a669cd8485941b89379523384c617eea v: v3 --- [refs] | 2 +- trunk/net/decnet/dn_dev.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f9b2f3922384..10b5e109b62e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eed73417d501c2c7bdef1bc8a1f7a1548a635b09 +refs/heads/master: c66b721a502cbbc15be8bd7c79c305fa40f1e6ce diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c index 01861feb608d..5b451e196fb9 100644 --- a/trunk/net/decnet/dn_dev.c +++ b/trunk/net/decnet/dn_dev.c @@ -255,12 +255,10 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms * struct dn_dev_sysctl_table *t; int i; - t = kmalloc(sizeof(*t), GFP_KERNEL); + t = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL); if (t == NULL) return; - memcpy(t, &dn_dev_sysctl, sizeof(*t)); - for(i = 0; i < ARRAY_SIZE(t->dn_dev_vars) - 1; i++) { long offset = (long)t->dn_dev_vars[i].data; t->dn_dev_vars[i].data = ((char *)parms) + offset;