From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932767AbdEVJPz (ORCPT ); Mon, 22 May 2017 05:15:55 -0400 Received: from mout.web.de ([212.227.15.14]:61105 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932549AbdEVJPu (ORCPT ); Mon, 22 May 2017 05:15:50 -0400 Subject: [PATCH 3/3] net: pktgen: Adjust five checks for null pointers From: SF Markus Elfring To: netdev@vger.kernel.org, Alexey Dobriyan , "David S. Miller" , Eric Dumazet , Florian Westphal , =?UTF-8?B?R8O8bnRlciBSw7Zjaw==?= , John Fastabend , Paolo Abeni , Willem de Bruijn Cc: LKML , kernel-janitors@vger.kernel.org References: <79472009-7764-bb92-5f29-60bb21793cec@users.sourceforge.net> Message-ID: <9cbf8dea-1a36-9388-af71-9c07d788d0af@users.sourceforge.net> Date: Mon, 22 May 2017 11:14:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <79472009-7764-bb92-5f29-60bb21793cec@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:XOrqF8yP92otXLck4WIWkeOb8jzqZutfWu44o7Z25hbfwPcveqB sM5N4tzxbstGyaiLwGpy3SuQwXomcML0lQ16pfmJ8FoIxEDIKanrxMGRWEMVH0588D5uh13 NlwGqR3+7yWTkPdFGvTqGOIpWQDTMyM4AmwNqPzCZ4g7e6GyaTJJ7pQc5Hx5aIIu777FkOM oUFObL14IPJTbArV2/W7Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:6IUnv2y9dtw=:re4+UWTSI9iHy4h6lg/Anb wTNMgmE8k7hSBhAybbJW55cie1Q2aykhngXsAvkBccxVoZDy1fsTr/xE1AE1Jd+5vaukIDoC3 3xw36cQ4Yh/0nZpgD8f8Kh68VU9cjs4fW+tfYbWEVmVatX21NjVw7+ejNMLbDefIx8WtI4QCl YqqMEl0pftnzb40jd5uUChpZsqG2FH8qN3iGy72fn06XinHCLiM6NVao76kj/D8K4QSpqFP/G SnvQtFuwrzkicd7f06Jeb8+qbOvQb0uJg2qYqEtoOsEGH0xAYNA9/3lF+6vOeLOZi0b53libi pfS59qbQAC5vk9ZEy5l8GFnAxQseNUGLUlm+zoQE8PyeZEh6FB8teCnOC+wQtaigdjdreQkCo Av04oRh/voFHJuM3Znhpfv8Gn9FLJJ3FFTR8aCIX/R0i0S8O116WXkI2C4u599AKCmNXp1L9M NYiprw2prLumtHdtnhMyM1c9CUcxqtbTYeVs7nJjYzmKnLhPYco21t4g8hOFXgc3to71jF1Ve xdjhKpgizd7PfzmuFe9lalmnOEc5IC4lgo0rwFNEFhZjObeYckd8gCT96CSYXK5qWR3Uo/C2D 6wW+c6Z7rzFAvQe+K32YnxL3n6hRe9Ke6QAun+hnk/5LQjCSSyrErP9ckGIPnpz5p6VqY0X+t FDShUZhQHcN4P49glC2062TOMGfx5mJgq66Zv7QmX2NCQbdSdi+dy/KtEhHXRz5X+vzecv6qD DnFfIdTxRcrBL8j4G5uSUZ7kZapb8gewmtQCKdVjtUFxlAv62eTD5XgFn0NSMkHqzVyb8Myw5 BZlcwOK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 22 May 2017 10:44:16 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written !… Thus fix the affected source code places. Signed-off-by: Markus Elfring --- net/core/pktgen.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 51008ddc7af6..a28350c9ac67 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1986,7 +1986,7 @@ static void pktgen_mark_device(const struct pktgen_net *pn, const char *ifname) while (1) { pkt_dev = __pktgen_NN_threads(pn, ifname, REMOVE); - if (pkt_dev == NULL) + if (!pkt_dev) break; /* success */ mutex_unlock(&pktgen_thread_lock); @@ -3274,7 +3274,7 @@ static struct pktgen_dev *next_to_run(struct pktgen_thread *t) list_for_each_entry_rcu(pkt_dev, &t->if_list, list) { if (!pkt_dev->running) continue; - if (best == NULL) + if (!best) best = pkt_dev; else if (ktime_compare(pkt_dev->next_tx, best->next_tx) < 0) best = pkt_dev; @@ -3402,7 +3402,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev) kfree_skb(pkt_dev->skb); pkt_dev->skb = fill_packet(odev, pkt_dev); - if (pkt_dev->skb == NULL) { + if (!pkt_dev->skb) { pr_err("ERROR: couldn't allocate skb in fill_packet\n"); schedule(); pkt_dev->clone_count--; /* back out increment, OOM */ @@ -3685,7 +3685,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) strcpy(pkt_dev->odevname, ifname); pkt_dev->flows = vzalloc_node(MAX_CFLOWS * sizeof(struct flow_state), node); - if (pkt_dev->flows == NULL) { + if (!pkt_dev->flows) { kfree(pkt_dev); return -ENOMEM; } @@ -3868,7 +3868,7 @@ static int __net_init pg_net_init(struct net *net) return -ENODEV; } pe = proc_create(PGCTRL, 0600, pn->proc_dir, &pktgen_fops); - if (pe == NULL) { + if (!pe) { pr_err("cannot create %s procfs entry\n", PGCTRL); ret = -EINVAL; goto remove; -- 2.13.0