diff for duplicates of <1161895771.30263.1.camel@alice> diff --git a/a/1.txt b/N1/1.txt index b4a1802..51a985d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,12 +6,12 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> --- linux-2.6.19-rc3-git1/net/atm/lec.c.orig 2006-10-26 20:21:48.000000000 +0200 +++ linux-2.6.19-rc3-git1/net/atm/lec.c 2006-10-26 20:23:28.000000000 +0200 @@ -1321,11 +1321,10 @@ static int lane2_resolve(struct net_devi - if (table = NULL) + if (table == NULL) return -1; - *tlvs = kmalloc(table->sizeoftlvs, GFP_ATOMIC); + *tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC); - if (*tlvs = NULL) + if (*tlvs == NULL) return -1; - memcpy(*tlvs, table->tlvs, table->sizeoftlvs); @@ -24,21 +24,21 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> - priv->tlvs = kmalloc(sizeoftlvs, GFP_KERNEL); + priv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL); - if (priv->tlvs = NULL) + if (priv->tlvs == NULL) return (0); priv->sizeoftlvs = sizeoftlvs; - memcpy(priv->tlvs, tlvs, sizeoftlvs); skb = alloc_skb(sizeoftlvs, GFP_ATOMIC); - if (skb = NULL) + if (skb == NULL) --- linux-2.6.19-rc3-git1/net/ax25/ax25_out.c.orig 2006-10-26 20:23:59.000000000 +0200 +++ linux-2.6.19-rc3-git1/net/ax25/ax25_out.c 2006-10-26 20:24:15.000000000 +0200 @@ -70,11 +70,10 @@ ax25_cb *ax25_send_frame(struct sk_buff ax25->dest_addr = *dest; if (digi != NULL) { -- if ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) = NULL) { -+ if ((ax25->digipeat = kmemdup(digi, sizeof(ax25_digi), GFP_ATOMIC)) = NULL) { +- if ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) { ++ if ((ax25->digipeat = kmemdup(digi, sizeof(ax25_digi), GFP_ATOMIC)) == NULL) { ax25_cb_put(ax25); return NULL; } @@ -52,9 +52,9 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> } if (ax25_rt->digipeat != NULL) { -- if ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) = NULL) { +- if ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) { + if ((ax25->digipeat = kmemdup(ax25_rt->digipeat, -+ sizeof(ax25_digi), GFP_ATOMIC)) = NULL) { ++ sizeof(ax25_digi), GFP_ATOMIC)) == NULL) { err = -ENOMEM; goto put; } @@ -79,12 +79,12 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> --- linux-2.6.19-rc3-git1/net/dccp/feat.c.orig 2006-10-26 20:26:12.000000000 +0200 +++ linux-2.6.19-rc3-git1/net/dccp/feat.c 2006-10-26 20:27:26.000000000 +0200 @@ -279,12 +279,11 @@ static int dccp_feat_nn(struct sock *sk, - if (opt = NULL) + if (opt == NULL) return -ENOMEM; - copy = kmalloc(len, GFP_ATOMIC); + copy = kmemdup(val, len, GFP_ATOMIC); - if (copy = NULL) { + if (copy == NULL) { kfree(opt); return -ENOMEM; } @@ -99,13 +99,13 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> - u8 *val = kmalloc(opt->dccpop_len, GFP_ATOMIC); + u8 *val = kmemdup(opt->dccpop_val, opt->dccpop_len, GFP_ATOMIC); - if (val = NULL) + if (val == NULL) goto out_clean; - memcpy(val, opt->dccpop_val, opt->dccpop_len); - newopt = kmalloc(sizeof(*newopt), GFP_ATOMIC); + newopt = kmemdup(opt, sizeof(*newopt), GFP_ATOMIC); - if (newopt = NULL) { + if (newopt == NULL) { kfree(val); goto out_clean; } @@ -135,7 +135,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> - t = kmalloc(sizeof(*t), GFP_KERNEL); + t = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL); - if (t = NULL) + if (t == NULL) return; - memcpy(t, &dn_dev_sysctl, sizeof(*t)); @@ -178,7 +178,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> - int *t; - - t = kmalloc(size, GFP_ATOMIC); -- if (t = NULL) +- if (t == NULL) - return NULL; - memcpy(t, table, size); - return t; @@ -194,7 +194,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> - t = kmalloc(sizeof(*t), GFP_KERNEL); + t = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL); - if (t = NULL) + if (t == NULL) return; - memcpy(t, &addrconf_sysctl, sizeof(*t)); for (i=0; t->addrconf_vars[i].data; i++) { @@ -208,7 +208,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> - value->t.oct_seq = kmalloc(len, GFP_ATOMIC); + value->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC); - if (value->t.oct_seq = NULL){ + if (value->t.oct_seq == NULL){ IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__); kfree(value); return NULL; @@ -223,9 +223,9 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> atomic_set(&nr_neigh->refcount, 1); if (ax25_digi != NULL && ax25_digi->ndigi > 0) { -- if ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) = NULL) { +- if ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) == NULL) { + if ((nr_neigh->digipeat = kmemdup(ax25_digi, -+ sizeof(*ax25_digi), GFP_KERNEL)) = NULL) { ++ sizeof(*ax25_digi), GFP_KERNEL)) == NULL) { kfree(nr_neigh); if (nr_node) nr_node_put(nr_node); @@ -240,9 +240,9 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> atomic_set(&nr_neigh->refcount, 1); if (ax25_digi != NULL && ax25_digi->ndigi > 0) { -- if ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) = NULL) { +- if ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) == NULL) { + if ((nr_neigh->digipeat = kmemdup(ax25_digi, -+ sizeof(*ax25_digi), GFP_KERNEL)) = NULL) { ++ sizeof(*ax25_digi), GFP_KERNEL)) == NULL) { kfree(nr_neigh); return -ENOMEM; } @@ -287,7 +287,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> } else { - void *v = kmalloc(data_len, GFP_KERNEL); + void *v = kmemdup(data, data_len, GFP_KERNEL); - if (v = NULL) { + if (v == NULL) { err = -ENOBUFS; goto errout; } @@ -317,7 +317,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> return ERR_PTR(-EFAULT); - dest->data = kmalloc(len, GFP_KERNEL); + dest->data = kmemdup(p, len, GFP_KERNEL); - if (unlikely(dest->data = NULL)) + if (unlikely(dest->data == NULL)) return ERR_PTR(-ENOMEM); dest->len = len; - memcpy(dest->data, p, len); @@ -332,7 +332,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> return ERR_PTR(-EFAULT); - res->data = kmalloc(len, GFP_KERNEL); + res->data = kmemdup(p, len, GFP_KERNEL); - if (unlikely(res->data = NULL)) + if (unlikely(res->data == NULL)) return ERR_PTR(-ENOMEM); - memcpy(res->data, p, len); res->len = len; @@ -346,7 +346,7 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> return ERR_PTR(-EFAULT); - res->data = kmalloc(len, GFP_KERNEL); + res->data = kmemdup(p, len, GFP_KERNEL); - if (unlikely(res->data = NULL)) + if (unlikely(res->data == NULL)) return ERR_PTR(-ENOMEM); - memcpy(res->data, p, len); return q; @@ -411,11 +411,11 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> +++ linux-2.6.19-rc3-git1/net/ipv4/cipso_ipv4.c 2006-10-26 22:39:35.000000000 +0200 @@ -377,12 +377,11 @@ int cipso_v4_cache_add(const struct sk_b entry = kzalloc(sizeof(*entry), GFP_ATOMIC); - if (entry = NULL) + if (entry == NULL) return -ENOMEM; - entry->key = kmalloc(cipso_ptr_len, GFP_ATOMIC); + entry->key = kmemdup(cipso_ptr, cipso_ptr_len, GFP_ATOMIC); - if (entry->key = NULL) { + if (entry->key == NULL) { ret_val = -ENOMEM; goto cache_add_failure; } @@ -423,9 +423,3 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> entry->key_len = cipso_ptr_len; entry->hash = cipso_v4_map_cache_hash(cipso_ptr, cipso_ptr_len); atomic_inc(&secattr->cache->refcount); - - -_______________________________________________ -Kernel-janitors mailing list -Kernel-janitors@lists.osdl.org -https://lists.osdl.org/mailman/listinfo/kernel-janitors diff --git a/a/content_digest b/N1/content_digest index d13c275..520e96d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01161889418.7318.1.camel@alice\0" "From\0Eric Sesterhenn <snakebyte@gmx.de>\0" "Subject\0Re: [KJ] [Patch] kmemdup() cleanup in net/\0" - "Date\0Thu, 26 Oct 2006 20:49:31 +0000\0" + "Date\0Thu, 26 Oct 2006 22:49:31 +0200\0" "To\0kernel-janitors <kernel-janitors@lists.osdl.org>\0" "Cc\0netdev@vger.kernel.org\0" "\00:1\0" @@ -14,12 +14,12 @@ "--- linux-2.6.19-rc3-git1/net/atm/lec.c.orig\t2006-10-26 20:21:48.000000000 +0200\n" "+++ linux-2.6.19-rc3-git1/net/atm/lec.c\t2006-10-26 20:23:28.000000000 +0200\n" "@@ -1321,11 +1321,10 @@ static int lane2_resolve(struct net_devi\n" - " \t\tif (table = NULL)\n" + " \t\tif (table == NULL)\n" " \t\t\treturn -1;\n" " \n" "-\t\t*tlvs = kmalloc(table->sizeoftlvs, GFP_ATOMIC);\n" "+\t\t*tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC);\n" - " \t\tif (*tlvs = NULL)\n" + " \t\tif (*tlvs == NULL)\n" " \t\t\treturn -1;\n" " \n" "-\t\tmemcpy(*tlvs, table->tlvs, table->sizeoftlvs);\n" @@ -32,21 +32,21 @@ " \n" "-\tpriv->tlvs = kmalloc(sizeoftlvs, GFP_KERNEL);\n" "+\tpriv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);\n" - " \tif (priv->tlvs = NULL)\n" + " \tif (priv->tlvs == NULL)\n" " \t\treturn (0);\n" " \tpriv->sizeoftlvs = sizeoftlvs;\n" "-\tmemcpy(priv->tlvs, tlvs, sizeoftlvs);\n" " \n" " \tskb = alloc_skb(sizeoftlvs, GFP_ATOMIC);\n" - " \tif (skb = NULL)\n" + " \tif (skb == NULL)\n" "--- linux-2.6.19-rc3-git1/net/ax25/ax25_out.c.orig\t2006-10-26 20:23:59.000000000 +0200\n" "+++ linux-2.6.19-rc3-git1/net/ax25/ax25_out.c\t2006-10-26 20:24:15.000000000 +0200\n" "@@ -70,11 +70,10 @@ ax25_cb *ax25_send_frame(struct sk_buff \n" " \tax25->dest_addr = *dest;\n" " \n" " \tif (digi != NULL) {\n" - "-\t\tif ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) = NULL) {\n" - "+\t\tif ((ax25->digipeat = kmemdup(digi, sizeof(ax25_digi), GFP_ATOMIC)) = NULL) {\n" + "-\t\tif ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {\n" + "+\t\tif ((ax25->digipeat = kmemdup(digi, sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {\n" " \t\t\tax25_cb_put(ax25);\n" " \t\t\treturn NULL;\n" " \t\t}\n" @@ -60,9 +60,9 @@ " \t}\n" " \n" " \tif (ax25_rt->digipeat != NULL) {\n" - "-\t\tif ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) = NULL) {\n" + "-\t\tif ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {\n" "+\t\tif ((ax25->digipeat = kmemdup(ax25_rt->digipeat, \n" - "+\t\t\tsizeof(ax25_digi), GFP_ATOMIC)) = NULL) {\n" + "+\t\t\tsizeof(ax25_digi), GFP_ATOMIC)) == NULL) {\n" " \t\t\terr = -ENOMEM;\n" " \t\t\tgoto put;\n" " \t\t}\n" @@ -87,12 +87,12 @@ "--- linux-2.6.19-rc3-git1/net/dccp/feat.c.orig\t2006-10-26 20:26:12.000000000 +0200\n" "+++ linux-2.6.19-rc3-git1/net/dccp/feat.c\t2006-10-26 20:27:26.000000000 +0200\n" "@@ -279,12 +279,11 @@ static int dccp_feat_nn(struct sock *sk,\n" - " \tif (opt = NULL)\n" + " \tif (opt == NULL)\n" " \t\treturn -ENOMEM;\n" " \n" "-\tcopy = kmalloc(len, GFP_ATOMIC);\n" "+\tcopy = kmemdup(val, len, GFP_ATOMIC);\n" - " \tif (copy = NULL) {\n" + " \tif (copy == NULL) {\n" " \t\tkfree(opt);\n" " \t\treturn -ENOMEM;\n" " \t}\n" @@ -107,13 +107,13 @@ "-\t\tu8 *val = kmalloc(opt->dccpop_len, GFP_ATOMIC);\n" "+\t\tu8 *val = kmemdup(opt->dccpop_val, opt->dccpop_len, GFP_ATOMIC);\n" " \n" - " \t\tif (val = NULL)\n" + " \t\tif (val == NULL)\n" " \t\t\tgoto out_clean;\n" "-\t\tmemcpy(val, opt->dccpop_val, opt->dccpop_len);\n" " \n" "-\t\tnewopt = kmalloc(sizeof(*newopt), GFP_ATOMIC);\n" "+\t\tnewopt = kmemdup(opt, sizeof(*newopt), GFP_ATOMIC);\n" - " \t\tif (newopt = NULL) {\n" + " \t\tif (newopt == NULL) {\n" " \t\t\tkfree(val);\n" " \t\t\tgoto out_clean;\n" " \t\t}\n" @@ -143,7 +143,7 @@ " \n" "-\tt = kmalloc(sizeof(*t), GFP_KERNEL);\n" "+\tt = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL);\n" - " \tif (t = NULL)\n" + " \tif (t == NULL)\n" " \t\treturn;\n" " \n" "-\tmemcpy(t, &dn_dev_sysctl, sizeof(*t));\n" @@ -186,7 +186,7 @@ "-\tint *t;\n" "-\n" "-\tt = kmalloc(size, GFP_ATOMIC);\n" - "-\tif (t = NULL)\n" + "-\tif (t == NULL)\n" "-\t\treturn NULL;\n" "-\tmemcpy(t, table, size);\n" "-\treturn t;\n" @@ -202,7 +202,7 @@ " \n" "-\tt = kmalloc(sizeof(*t), GFP_KERNEL);\n" "+\tt = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL);\n" - " \tif (t = NULL)\n" + " \tif (t == NULL)\n" " \t\treturn;\n" "-\tmemcpy(t, &addrconf_sysctl, sizeof(*t));\n" " \tfor (i=0; t->addrconf_vars[i].data; i++) {\n" @@ -216,7 +216,7 @@ " \n" "-\tvalue->t.oct_seq = kmalloc(len, GFP_ATOMIC);\n" "+\tvalue->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC);\n" - " \tif (value->t.oct_seq = NULL){\n" + " \tif (value->t.oct_seq == NULL){\n" " \t\tIRDA_WARNING(\"%s: Unable to kmalloc!\\n\", __FUNCTION__);\n" " \t\tkfree(value);\n" " \t\treturn NULL;\n" @@ -231,9 +231,9 @@ " \t\tatomic_set(&nr_neigh->refcount, 1);\n" " \n" " \t\tif (ax25_digi != NULL && ax25_digi->ndigi > 0) {\n" - "-\t\t\tif ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) = NULL) {\n" + "-\t\t\tif ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) == NULL) {\n" "+\t\t\tif ((nr_neigh->digipeat = kmemdup(ax25_digi, \n" - "+\t\t\t\tsizeof(*ax25_digi), GFP_KERNEL)) = NULL) {\n" + "+\t\t\t\tsizeof(*ax25_digi), GFP_KERNEL)) == NULL) {\n" " \t\t\t\tkfree(nr_neigh);\n" " \t\t\t\tif (nr_node)\n" " \t\t\t\t\tnr_node_put(nr_node);\n" @@ -248,9 +248,9 @@ " \tatomic_set(&nr_neigh->refcount, 1);\n" " \n" " \tif (ax25_digi != NULL && ax25_digi->ndigi > 0) {\n" - "-\t\tif ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) = NULL) {\n" + "-\t\tif ((nr_neigh->digipeat = kmalloc(sizeof(*ax25_digi), GFP_KERNEL)) == NULL) {\n" "+\t\tif ((nr_neigh->digipeat = kmemdup(ax25_digi,\n" - "+\t\t\tsizeof(*ax25_digi), GFP_KERNEL)) = NULL) {\n" + "+\t\t\tsizeof(*ax25_digi), GFP_KERNEL)) == NULL) {\n" " \t\t\tkfree(nr_neigh);\n" " \t\t\treturn -ENOMEM;\n" " \t\t}\n" @@ -295,7 +295,7 @@ " \t\t\t} else {\n" "-\t\t\t\tvoid *v = kmalloc(data_len, GFP_KERNEL);\n" "+\t\t\t\tvoid *v = kmemdup(data, data_len, GFP_KERNEL);\n" - " \t\t\t\tif (v = NULL) {\n" + " \t\t\t\tif (v == NULL) {\n" " \t\t\t\t\terr = -ENOBUFS;\n" " \t\t\t\t\tgoto errout;\n" " \t\t\t\t}\n" @@ -325,7 +325,7 @@ " \t\treturn ERR_PTR(-EFAULT);\n" "-\tdest->data = kmalloc(len, GFP_KERNEL);\n" "+\tdest->data = kmemdup(p, len, GFP_KERNEL);\n" - " \tif (unlikely(dest->data = NULL))\n" + " \tif (unlikely(dest->data == NULL))\n" " \t\treturn ERR_PTR(-ENOMEM);\n" " \tdest->len = len;\n" "-\tmemcpy(dest->data, p, len);\n" @@ -340,7 +340,7 @@ " \t\treturn ERR_PTR(-EFAULT);\n" "-\tres->data = kmalloc(len, GFP_KERNEL);\n" "+\tres->data = kmemdup(p, len, GFP_KERNEL);\n" - " \tif (unlikely(res->data = NULL))\n" + " \tif (unlikely(res->data == NULL))\n" " \t\treturn ERR_PTR(-ENOMEM);\n" "-\tmemcpy(res->data, p, len);\n" " \tres->len = len;\n" @@ -354,7 +354,7 @@ " \t\treturn ERR_PTR(-EFAULT);\n" "-\tres->data = kmalloc(len, GFP_KERNEL);\n" "+\tres->data = kmemdup(p, len, GFP_KERNEL);\n" - " \tif (unlikely(res->data = NULL))\n" + " \tif (unlikely(res->data == NULL))\n" " \t\treturn ERR_PTR(-ENOMEM);\n" "-\tmemcpy(res->data, p, len);\n" " \treturn q;\n" @@ -419,23 +419,17 @@ "+++ linux-2.6.19-rc3-git1/net/ipv4/cipso_ipv4.c\t2006-10-26 22:39:35.000000000 +0200\n" "@@ -377,12 +377,11 @@ int cipso_v4_cache_add(const struct sk_b\n" " \tentry = kzalloc(sizeof(*entry), GFP_ATOMIC);\n" - " \tif (entry = NULL)\n" + " \tif (entry == NULL)\n" " \t\treturn -ENOMEM;\n" "-\tentry->key = kmalloc(cipso_ptr_len, GFP_ATOMIC);\n" "+\tentry->key = kmemdup(cipso_ptr, cipso_ptr_len, GFP_ATOMIC);\n" - " \tif (entry->key = NULL) {\n" + " \tif (entry->key == NULL) {\n" " \t\tret_val = -ENOMEM;\n" " \t\tgoto cache_add_failure;\n" " \t}\n" "-\tmemcpy(entry->key, cipso_ptr, cipso_ptr_len);\n" " \tentry->key_len = cipso_ptr_len;\n" " \tentry->hash = cipso_v4_map_cache_hash(cipso_ptr, cipso_ptr_len);\n" - " \tatomic_inc(&secattr->cache->refcount);\n" - "\n" - "\n" - "_______________________________________________\n" - "Kernel-janitors mailing list\n" - "Kernel-janitors@lists.osdl.org\n" - https://lists.osdl.org/mailman/listinfo/kernel-janitors + " \tatomic_inc(&secattr->cache->refcount);" -5348724581b8155e7043e65445a039e8c9b7e16347a82ab6c42084ab09821e46 +8291b9f21bcf8f8aaa08096a2e45e7cfd16f1e95cfe844fb0477a399134d6cca
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.