diff for duplicates of <1d76ff36-b20c-6bd7-dc34-00a2a976e8aa@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index f47c171..2638949 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 struct atmlec_msg *mesg; skb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC); -- if (skb2 = NULL) +- if (skb2 == NULL) + if (!skb2) return; skb2->len = sizeof(struct atmlec_msg); @@ -32,7 +32,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 min_frame_size - skb->truesize, GFP_ATOMIC); dev_kfree_skb(skb); -- if (skb2 = NULL) { +- if (skb2 == NULL) { + if (!skb2) { dev->stats.tx_dropped++; return NETDEV_TX_OK; @@ -41,7 +41,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 pr_debug("%s: bridge zeppelin asks about %pM\n", dev->name, mesg->content.proxy.mac_addr); -- if (br_fdb_test_addr_hook = NULL) +- if (br_fdb_test_addr_hook == NULL) + if (!br_fdb_test_addr_hook) break; @@ -50,7 +50,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 pr_debug("%s: entry found, responding to zeppelin\n", dev->name); skb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC); -- if (skb2 = NULL) +- if (skb2 == NULL) + if (!skb2) break; skb2->len = sizeof(struct atmlec_msg); @@ -77,7 +77,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 struct lec_vcc_priv *vpriv = LEC_VCC_PRIV(vcc); struct net_device *dev = skb->dev; -- if (vpriv = NULL) { +- if (vpriv == NULL) { + if (!vpriv) { pr_info("vpriv = NULL!?!?!?\n"); return; @@ -95,12 +95,12 @@ index a11dbd3a5119..ca3aec0c0743 100644 spin_lock_irqsave(&priv->lec_arp_lock, flags); table = lec_arp_find(priv, dst_mac); spin_unlock_irqrestore(&priv->lec_arp_lock, flags); -- if (table = NULL) +- if (table == NULL) + if (!table) return -1; *tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC); -- if (*tlvs = NULL) +- if (*tlvs == NULL) + if (!*tlvs) return -1; @@ -109,13 +109,13 @@ index a11dbd3a5119..ca3aec0c0743 100644 return 0; } -- if (sizeoftlvs = NULL) +- if (sizeoftlvs == NULL) + if (!sizeoftlvs) retval = send_to_lecd(priv, l_arp_xmt, dst_mac, NULL, NULL); else { skb = alloc_skb(*sizeoftlvs, GFP_ATOMIC); -- if (skb = NULL) +- if (skb == NULL) + if (!skb) return -1; skb->len = *sizeoftlvs; @@ -124,13 +124,13 @@ index a11dbd3a5119..ca3aec0c0743 100644 kfree(priv->tlvs); /* NULL if there was no previous association */ priv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL); -- if (priv->tlvs = NULL) +- if (priv->tlvs == NULL) + if (!priv->tlvs) return 0; priv->sizeoftlvs = sizeoftlvs; skb = alloc_skb(sizeoftlvs, GFP_ATOMIC); -- if (skb = NULL) +- if (skb == NULL) + if (!skb) return 0; skb->len = sizeoftlvs; @@ -139,14 +139,14 @@ index a11dbd3a5119..ca3aec0c0743 100644 */ struct lec_arp_table *entry = lec_arp_find(priv, mac_addr); -- if (entry = NULL) +- if (entry == NULL) + if (!entry) return; /* should not happen */ kfree(entry->tlvs); entry->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL); -- if (entry->tlvs = NULL) +- if (entry->tlvs == NULL) + if (!entry->tlvs) return; entry->sizeoftlvs = sizeoftlvs; @@ -155,7 +155,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 spin_lock_irqsave(&priv->lec_arp_lock, flags); entry = lec_arp_find(priv, mac_addr); -- if (entry = NULL && targetless_le_arp) +- if (entry == NULL && targetless_le_arp) + if (!entry && targetless_le_arp) goto out; /* * LANE2: ignore targetless LE_ARPs for which @@ -164,7 +164,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 entry->old_recv_push = old_push; #endif entry = make_entry(priv, bus_mac); -- if (entry = NULL) +- if (entry == NULL) + if (!entry) goto out; del_timer(&entry->timer); @@ -173,7 +173,7 @@ index a11dbd3a5119..ca3aec0c0743 100644 ioc_data->atm_addr[16], ioc_data->atm_addr[17], ioc_data->atm_addr[18], ioc_data->atm_addr[19]); entry = make_entry(priv, bus_mac); -- if (entry = NULL) +- if (entry == NULL) + if (!entry) goto out; memcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN); diff --git a/a/content_digest b/N1/content_digest index 64fe424..b30c184 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\049543220-93e4-781c-877b-381277837152@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 3/5] atm: Adjust 19 checks for null pointers\0" - "Date\0Sun, 21 May 2017 20:16:21 +0000\0" + "Date\0Sun, 21 May 2017 22:16:21 +0200\0" "To\0netdev@vger.kernel.org" Augusto Mecking Caringi <augustocaringi@gmail.com> David S. Miller <davem@davemloft.net> @@ -37,7 +37,7 @@ " \t\tstruct atmlec_msg *mesg;\n" " \n" " \t\tskb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);\n" - "-\t\tif (skb2 = NULL)\n" + "-\t\tif (skb2 == NULL)\n" "+\t\tif (!skb2)\n" " \t\t\treturn;\n" " \t\tskb2->len = sizeof(struct atmlec_msg);\n" @@ -46,7 +46,7 @@ " \t\t\t\t\t min_frame_size - skb->truesize,\n" " \t\t\t\t\t GFP_ATOMIC);\n" " \t\t\tdev_kfree_skb(skb);\n" - "-\t\t\tif (skb2 = NULL) {\n" + "-\t\t\tif (skb2 == NULL) {\n" "+\t\t\tif (!skb2) {\n" " \t\t\t\tdev->stats.tx_dropped++;\n" " \t\t\t\treturn NETDEV_TX_OK;\n" @@ -55,7 +55,7 @@ " \t\tpr_debug(\"%s: bridge zeppelin asks about %pM\\n\",\n" " \t\t\t dev->name, mesg->content.proxy.mac_addr);\n" " \n" - "-\t\tif (br_fdb_test_addr_hook = NULL)\n" + "-\t\tif (br_fdb_test_addr_hook == NULL)\n" "+\t\tif (!br_fdb_test_addr_hook)\n" " \t\t\tbreak;\n" " \n" @@ -64,7 +64,7 @@ " \t\t\tpr_debug(\"%s: entry found, responding to zeppelin\\n\",\n" " \t\t\t\t dev->name);\n" " \t\t\tskb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);\n" - "-\t\t\tif (skb2 = NULL)\n" + "-\t\t\tif (skb2 == NULL)\n" "+\t\t\tif (!skb2)\n" " \t\t\t\tbreak;\n" " \t\t\tskb2->len = sizeof(struct atmlec_msg);\n" @@ -91,7 +91,7 @@ " \tstruct lec_vcc_priv *vpriv = LEC_VCC_PRIV(vcc);\n" " \tstruct net_device *dev = skb->dev;\n" " \n" - "-\tif (vpriv = NULL) {\n" + "-\tif (vpriv == NULL) {\n" "+\tif (!vpriv) {\n" " \t\tpr_info(\"vpriv = NULL!?!?!?\\n\");\n" " \t\treturn;\n" @@ -109,12 +109,12 @@ " \t\tspin_lock_irqsave(&priv->lec_arp_lock, flags);\n" " \t\ttable = lec_arp_find(priv, dst_mac);\n" " \t\tspin_unlock_irqrestore(&priv->lec_arp_lock, flags);\n" - "-\t\tif (table = NULL)\n" + "-\t\tif (table == NULL)\n" "+\t\tif (!table)\n" " \t\t\treturn -1;\n" " \n" " \t\t*tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC);\n" - "-\t\tif (*tlvs = NULL)\n" + "-\t\tif (*tlvs == NULL)\n" "+\t\tif (!*tlvs)\n" " \t\t\treturn -1;\n" " \n" @@ -123,13 +123,13 @@ " \t\treturn 0;\n" " \t}\n" " \n" - "-\tif (sizeoftlvs = NULL)\n" + "-\tif (sizeoftlvs == NULL)\n" "+\tif (!sizeoftlvs)\n" " \t\tretval = send_to_lecd(priv, l_arp_xmt, dst_mac, NULL, NULL);\n" " \n" " \telse {\n" " \t\tskb = alloc_skb(*sizeoftlvs, GFP_ATOMIC);\n" - "-\t\tif (skb = NULL)\n" + "-\t\tif (skb == NULL)\n" "+\t\tif (!skb)\n" " \t\t\treturn -1;\n" " \t\tskb->len = *sizeoftlvs;\n" @@ -138,13 +138,13 @@ " \tkfree(priv->tlvs);\t/* NULL if there was no previous association */\n" " \n" " \tpriv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);\n" - "-\tif (priv->tlvs = NULL)\n" + "-\tif (priv->tlvs == NULL)\n" "+\tif (!priv->tlvs)\n" " \t\treturn 0;\n" " \tpriv->sizeoftlvs = sizeoftlvs;\n" " \n" " \tskb = alloc_skb(sizeoftlvs, GFP_ATOMIC);\n" - "-\tif (skb = NULL)\n" + "-\tif (skb == NULL)\n" "+\tif (!skb)\n" " \t\treturn 0;\n" " \tskb->len = sizeoftlvs;\n" @@ -153,14 +153,14 @@ " \t\t\t\t */\n" " \tstruct lec_arp_table *entry = lec_arp_find(priv, mac_addr);\n" " \n" - "-\tif (entry = NULL)\n" + "-\tif (entry == NULL)\n" "+\tif (!entry)\n" " \t\treturn;\t\t/* should not happen */\n" " \n" " \tkfree(entry->tlvs);\n" " \n" " \tentry->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);\n" - "-\tif (entry->tlvs = NULL)\n" + "-\tif (entry->tlvs == NULL)\n" "+\tif (!entry->tlvs)\n" " \t\treturn;\n" " \tentry->sizeoftlvs = sizeoftlvs;\n" @@ -169,7 +169,7 @@ " \n" " \tspin_lock_irqsave(&priv->lec_arp_lock, flags);\n" " \tentry = lec_arp_find(priv, mac_addr);\n" - "-\tif (entry = NULL && targetless_le_arp)\n" + "-\tif (entry == NULL && targetless_le_arp)\n" "+\tif (!entry && targetless_le_arp)\n" " \t\tgoto out;\t/*\n" " \t\t\t\t * LANE2: ignore targetless LE_ARPs for which\n" @@ -178,7 +178,7 @@ " \t\tentry->old_recv_push = old_push;\n" " #endif\n" " \t\tentry = make_entry(priv, bus_mac);\n" - "-\t\tif (entry = NULL)\n" + "-\t\tif (entry == NULL)\n" "+\t\tif (!entry)\n" " \t\t\tgoto out;\n" " \t\tdel_timer(&entry->timer);\n" @@ -187,7 +187,7 @@ " \t\t\t ioc_data->atm_addr[16], ioc_data->atm_addr[17],\n" " \t\t\t ioc_data->atm_addr[18], ioc_data->atm_addr[19]);\n" " \t\tentry = make_entry(priv, bus_mac);\n" - "-\t\tif (entry = NULL)\n" + "-\t\tif (entry == NULL)\n" "+\t\tif (!entry)\n" " \t\t\tgoto out;\n" " \t\tmemcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN);\n" @@ -195,4 +195,4 @@ "-- \n" 2.13.0 -16cf9cd601b6a7d3ab8fdfd4274416e3c0b111a122d5590bb4f918888b34293b +5c18895fdd308543629a13e08ba760e46e03391f7fa4ce847ab780b860ac519b
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.