From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbdKHSnu (ORCPT ); Wed, 8 Nov 2017 13:43:50 -0500 Received: from mout.web.de ([212.227.17.11]:60184 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751352AbdKHSns (ORCPT ); Wed, 8 Nov 2017 13:43:48 -0500 Subject: [PATCH 3/3] net: sched: cls_fw: Adjust nine checks for null pointers From: SF Markus Elfring To: netdev@vger.kernel.org, Cong Wang , "David S. Miller" , Jamal Hadi Salim , Jiri Pirko Cc: LKML , kernel-janitors@vger.kernel.org References: <32efa965-896f-f24a-4d30-586e10c54a5b@users.sourceforge.net> Message-ID: <00424321-0237-9c10-613a-7bea90c66a7e@users.sourceforge.net> Date: Wed, 8 Nov 2017 19:43:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <32efa965-896f-f24a-4d30-586e10c54a5b@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:4HIZPpbWSP1aPiNLKLMLtti1GeI74GpVbMGLx+DG8QIAD3JMsbt DH8ntk6Y1W1EsGBXdkUS4y+Hw2Pu0TpmgH8EY9QMkQM2Tfffxk1jDjrO6Z5vgdsx+cxYLiM rb+Uc3fdcU0uuD+nYMxFAYonlcZOLb/mAuxZSrPQ8MdkOwsiiHX6akGBBVOUQmOlQSznrqs gobbBnOFRJymyqvjPbrZQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:N9wR6cWsfh4=:m8mpFpaXnhQsj+SuD3AoiH MXewQSAmWBBb4Jta0bnWKljlX/nzntegy/WnGHSqNoDnH7Ja3/942bWY7lgzcn2GWvqEOfHsE bJrqhd95QkaSuhTZySi285DOKyQ5XgXFtxqF0maLwn+CTS+AzKgrr4tIOq9RYUl14aHljkiS8 VnvR1tudAfpQvhztZOeSiuhHTxGnMIc6ewR4H+R6X3ZxAjdmLTTtDCkFyOpgNNgjTgCZHGYU0 8xR5XxHPi3VC8pWXPrLvCLSfGsOGAnh4cHW3Zl4xW8+I0Aq7lUZmHX79v+ymzwK98JRKY6bhd BkBPZ4O4iRpJ3r2CKNXbNJeLbLmtB/aWtikyo3p8TcRYz8s67KQAX1yFVqacPcgdoLw4tmv61 Gle6A49DMzwRNeQKwpeDv3uoS8FLMW7+dfDzQfJkRP5h44H277AULY6dAN07EgvMa7elJ4u3c JBF3jr7zxaAkq5vBkUrN36VnNnNkfGGq7IF0up3zLyNDyVCPsbik0SnQhxCmMAjdRVSxBubYc LqAfIEEtt/0qLnSkyyKep5nBBI8ReFcbOR3ned0H94LlQpRm9UhXwZBxaW5T2S+KH/OHDLIti UQP6vrgEtSvydh78WtYuXsPO36fSjslRrS1wn1xCNxu73AGZ9nhFeWhfID3vLbyeDwuNZVjTZ bV+Fn1cNKJ/qh/YzNcSgvYn/Ldfm/PO537/H9eCt4LGW/U+oWnp9196T7iit/3nsiXTzvSgxR YZf6Fmv5e6DfHt/xVob85RQsuwSNovqVhU3Y5OriZO7qeJBYpTL8j6JuVdKo2VROYsLobEVAB hsOiS+81iOq5iExrq3nUvTSgPBYDKMTLxkP2UUOgVEELZP/B9c= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 8 Nov 2017 19:26:29 +0100 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/sched/cls_fw.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 53c1c8ae3e00..2af2627d6f45 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -68,7 +68,7 @@ static int fw_classify(struct sk_buff *skb, const struct tcf_proto *tp, int r; u32 id = skb->mark; - if (head != NULL) { + if (head) { id &= head->mask; for (f = rcu_dereference_bh(head->ht[fw_hash(id)]); f; @@ -106,7 +106,7 @@ static void *fw_get(struct tcf_proto *tp, u32 handle) struct fw_head *head = rtnl_dereference(tp->root); struct fw_filter *f; - if (head == NULL) + if (!head) return NULL; f = rtnl_dereference(head->ht[fw_hash(handle)]); @@ -149,7 +149,7 @@ static void fw_destroy(struct tcf_proto *tp) struct fw_filter *f; int h; - if (head == NULL) + if (!head) return; for (h = 0; h < HTSIZE; h++) { @@ -172,7 +172,7 @@ static int fw_delete(struct tcf_proto *tp, void *arg, bool *last) int ret = -EINVAL; int h; - if (head == NULL || f == NULL) + if (!head || !f) goto out; fp = &head->ht[fw_hash(f->id)]; @@ -324,7 +324,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb, } f = kzalloc(sizeof(*f), GFP_KERNEL); - if (f == NULL) + if (!f) return -ENOBUFS; err = tcf_exts_init(&f->exts, TCA_FW_ACT, TCA_FW_POLICE); @@ -354,7 +354,7 @@ static void fw_walk(struct tcf_proto *tp, struct tcf_walker *arg) struct fw_head *head = rtnl_dereference(tp->root); int h; - if (head == NULL) + if (!head) arg->stop = 1; if (arg->stop) @@ -385,7 +385,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, void *fh, struct fw_filter *f = fh; struct nlattr *nest; - if (f == NULL) + if (!f) return skb->len; t->tcm_handle = f->id; @@ -394,7 +394,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, void *fh, return skb->len; nest = nla_nest_start(skb, TCA_OPTIONS); - if (nest == NULL) + if (!nest) goto nla_put_failure; if (f->res.classid && -- 2.15.0