From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753232AbdAZKTy (ORCPT ); Thu, 26 Jan 2017 05:19:54 -0500 Received: from mout.web.de ([212.227.17.12]:61279 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbdAZKTu (ORCPT ); Thu, 26 Jan 2017 05:19:50 -0500 Subject: [PATCH 3/5] gtp: Adjust 12 checks for null pointers To: netdev@vger.kernel.org, Alexey Dobriyan , "David S. Miller" , Harald Welte , Johannes Berg , Pablo Neira References: <698070a4-e08e-78e5-0214-df69783cce22@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <10c20387-4a38-726e-ea58-2a06d50239a5@users.sourceforge.net> Date: Thu, 26 Jan 2017 11:19:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <698070a4-e08e-78e5-0214-df69783cce22@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:MfkuApxqbdnivTg4ij6+YOZWSGtAZFO4FgatyBZIEkAKrTVU8ru bFrWx4dcvyzT4pPk8/Wunfc7dg3Mul4zEz/DIamEucSMduH2C5N4D79+ytaJBXL3PeXOYW/ w2ks6cQzaJ1FdK4vTQOqyx7k+a7Q8xR7AY3wBDFEtOmgomYs15XGSJqio3xbMgiFtHToLLL cNF9lMjSjw9zgx73t71hQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Q9mSJkW6AMg=:uIsAliNybrTVQ9oJYIi//r kaJ6rJT2DsDYnXOk+8wd+4+VF5oj9xDJETe8cQpYqcYInPpZUNGLwB8tHTsrVF2WE5O2fcWV2 re5fHvDbPF71QhWScZVhxGSRPgZAmgNYSQkZEXxNv8WtwO7SLxte735TT+cILxLM6c3u4uRw6 4rp4i/sDqpGJTUZFkV9S+bLvFE7z2AJYy3qbgTeZobMsJj1sr6fljYXKeYE0ow5C1s6+q3QqP kM3VgbYvhMCng8BeK0mYfE6h/5pSRzMLJqIplvsOD3gvNzD0XGPvj7OC6wdDgJOVFYeAm60Oz Y+nnVXQs0/J/CGTnIyYAo6w219X1UbMLOnCZFRzm1/W53J/QzyfwBQNL9ucJgUQu1o4D6WVHQ JdX2/BagX4S8+/L1vGq2nIelIvEQ0VAGiQibUSAiwHy6IpRDGQzDPVOHUOLEDBHmghz2AZzGa zrw2EErkdBBCfNJQerKtYsg+Y7L2zFN4HhpIpdz1igcMp29qcVBJ2CgFEEt81C5CmNdpMpuBW suu7a5326uX4+0cfsHIMKW21Gvp1z5T08kj5LiCcRA6QxV7BdOjKaHrNhLYShnNpVhw9+OAmF wl91ttd3jublrUMCGZ1S5kISYKDnLqbl35iNj2YLo9fMO++qM9d3TciCKfbB2wLTgc64RI/C7 nrMB8hPcoZ5sqVgjdWXzZ+IAOkddua6xdV/6XzzUFIaLLeqZv1we8V1ZE4tBlh/855nqpHEmZ OQ/WmwKzLabI6yA4ae501IWnz+bvN9QuVmC4MUI1MZImurC8E9fO+tqY3RBrgDwtsTiSK0YIR Uh/wkn7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 25 Jan 2017 22:50:23 +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 --- drivers/net/gtp.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index f0c123101aa9..7e38786361d8 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -785,12 +785,12 @@ static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize) gtp->addr_hash = kmalloc_array(hsize, sizeof(*gtp->addr_hash), GFP_KERNEL); - if (gtp->addr_hash == NULL) + if (!gtp->addr_hash) return -ENOMEM; gtp->tid_hash = kmalloc_array(hsize, sizeof(*gtp->tid_hash), GFP_KERNEL); - if (gtp->tid_hash == NULL) + if (!gtp->tid_hash) goto err1; gtp->hash_size = hsize; @@ -832,7 +832,7 @@ static int gtp_encap_enable(struct net_device *dev, struct gtp_dev *gtp, netdev_dbg(dev, "enable gtp on %d, %d\n", fd_gtp0, fd_gtp1); sock0 = sockfd_lookup(fd_gtp0, &err); - if (sock0 == NULL) { + if (!sock0) { netdev_dbg(dev, "socket fd=%d not found (gtp0)\n", fd_gtp0); return -ENOENT; } @@ -844,7 +844,7 @@ static int gtp_encap_enable(struct net_device *dev, struct gtp_dev *gtp, } sock1u = sockfd_lookup(fd_gtp1, &err); - if (sock1u == NULL) { + if (!sock1u) { netdev_dbg(dev, "socket fd=%d not found (gtp1u)\n", fd_gtp1); err = -ENOENT; goto err1; @@ -957,7 +957,7 @@ static int ipv4_pdp_add(struct net_device *dev, struct genl_info *info) } pctx = kmalloc(sizeof(*pctx), GFP_KERNEL); - if (pctx == NULL) + if (!pctx) return -ENOMEM; ipv4_pdp_fill(pctx, info); @@ -1029,7 +1029,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info) /* Check if there's an existing gtpX device to configure */ dev = gtp_find_dev(net, nla_get_u32(info->attrs[GTPA_LINK])); - if (dev == NULL) { + if (!dev) { put_net(net); return -ENODEV; } @@ -1055,7 +1055,7 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) /* Check if there's an existing gtpX device to configure */ dev = gtp_find_dev(net, nla_get_u32(info->attrs[GTPA_LINK])); - if (dev == NULL) { + if (!dev) { put_net(net); return -ENODEV; } @@ -1079,7 +1079,7 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) return -EINVAL; } - if (pctx == NULL) + if (!pctx) return -ENOENT; if (pctx->gtp_version == GTP_V0) @@ -1105,7 +1105,7 @@ static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, 0, type); - if (genlh == NULL) + if (!genlh) goto nlmsg_failure; if (nla_put_u32(skb, GTPA_VERSION, pctx->gtp_version) || @@ -1163,7 +1163,7 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) /* Check if there's an existing gtpX device to configure */ dev = gtp_find_dev(net, nla_get_u32(info->attrs[GTPA_LINK])); - if (dev == NULL) { + if (!dev) { put_net(net); return -ENODEV; } @@ -1188,13 +1188,13 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) pctx = ipv4_pdp_find(gtp, ip); } - if (pctx == NULL) { + if (!pctx) { err = -ENOENT; goto err_unlock; } skb2 = genlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC); - if (skb2 == NULL) { + if (!skb2) { err = -ENOMEM; goto err_unlock; } -- 2.11.0