From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757041AbcIRGXU (ORCPT ); Sun, 18 Sep 2016 02:23:20 -0400 Received: from mout.web.de ([212.227.17.12]:51573 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754059AbcIRGXL (ORCPT ); Sun, 18 Sep 2016 02:23:11 -0400 Subject: [PATCH 10/10] firewire-net: Adjust checks for null pointers in five functions To: linux1394-devel@lists.sourceforge.net, Stefan Richter References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <99ff298b-0caa-9f47-d7db-57b6fbd69360@users.sourceforge.net> Date: Sun, 18 Sep 2016 08:22:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:3MKrcWJ/+cQhxOW6jd3whjC9qNlVfxnMeaQV0GN31Lb/LlR3zg4 N0mmWHKX7A/kAoWuVMw+wugLppCFp4myrnh3Gu693/acCSz0bq3DHLr6vwGXtU30YXyQAMn stHJPNBvlA4Dg/h4r+jMf9ctVll/EbgqhJu3WxXsii1MOyukie/ZXdg5zZslSXw63y940dO orlGgj9kzsKn+1H/jxaFQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:KNt4vteNKoQ=:bXgpthaXsq2aYpjUro6V5B FgzkGzLZ4R2y6Bqyo/VMGhqSXUTGPSFgxbzPf/QxpMa0DkQrLqSakZIzAQVRgDv7hml6DXb0g sCkwlsSqGS3iHviDUtqiFZbyPtbMMr1Lvo0TWVON6r602nZlvtDSYwPGP7EcQGhmlLTufvyI8 7wF+t0DbpBr+G1/q4NuCBGJbCQQ1CUlCLtS+mMmiNNmTky3wrLsHqAdDCvCcJJCYfmTjxlT5X KfCWzgqfFoU5OAanMsrDGYPWBUuO71Pe6frtbUsJHg4U5ITxkWeX4CgG/AOHMToyy/6vjMCL2 xeIU+x3FayJZg/g+oEB5Xs2ZFAwOv8B12N9hCKQzhxB5IHN72rdw/6Nf6niEE9JclgZZ0x0H0 psT6o65D1iIbIiLpRuf6fvi8S0hhBDYTnlmxIl843B/VwBOubc6Zc9RZ7crTs7nAgMMHzgbq0 HpalW9ytZajt2RUf3xSsHEmSeuh4sDQbAsS33jhIMi632Z/pg3QCFfzBpVQubG/yh6DjtjZGP 0AH58rcYe5nXkDJJqT53cmEQ2uK/M6RV+yd+5VF06GAT8ruNzILkraNs+F9q4IivBdLmVasMy 3G55pWIhvUie750ey2TDW6aSLjJRGglBXpSpJoPDk/iKpR9d9hrI7nGkM8Hn8tTuxee9XCFXX t29/72zVexhVaDEU3vSDoGg09FiooICF95NediX8yyZPmbkihDIy/KCw3G5rJT+XTPnIgnioD LqIBLfJjvE2pZtcDfqoMa3f84gFzQ7TC/ohK5mXFrU0K+SZMsKRO+7PtzYMFOT1Vtzi0tynKt Oi4QM8A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 18 Sep 2016 07:48:56 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script "checkpatch.pl" can point information out like the following. Comparison to NULL could be written !… Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/firewire/net.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index eb7ce5e..e313be3 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -366,13 +366,13 @@ static struct fwnet_partial_datagram *fwnet_pd_new(struct net_device *net, INIT_LIST_HEAD(&new->fi_list); fi = fwnet_frag_new(new, frag_off, frag_len); - if (fi == NULL) + if (!fi) goto free_new; new->datagram_label = datagram_label; new->datagram_size = dg_size; new->skb = dev_alloc_skb(dg_size + LL_RESERVED_SPACE(net)); - if (new->skb == NULL) + if (!new->skb) goto free_fragment_info; skb_reserve(new->skb, LL_RESERVED_SPACE(net)); @@ -418,7 +418,7 @@ static bool fwnet_pd_update(struct fwnet_peer *peer, struct fwnet_partial_datagram *pd, void *frag_buf, unsigned frag_off, unsigned frag_len) { - if (fwnet_frag_new(pd, frag_off, frag_len) == NULL) + if (!fwnet_frag_new(pd, frag_off, frag_len)) return false; memcpy(pd->pbuf + frag_off, frag_buf, frag_len); @@ -623,7 +623,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len, } pd = fwnet_pd_find(peer, datagram_label); - if (pd == NULL) { + if (!pd) { while (peer->pdg_size >= FWNET_MAX_FRAGMENTS) { /* remove the oldest */ fwnet_pd_delete(list_first_entry(&peer->pd_list, @@ -632,7 +632,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len, } pd = fwnet_pd_new(net, peer, datagram_label, dg_size, buf, fg_off, len); - if (pd == NULL) { + if (!pd) { retval = -ENOMEM; goto unlock; } @@ -647,7 +647,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len, fwnet_pd_delete(pd); pd = fwnet_pd_new(net, peer, datagram_label, dg_size, buf, fg_off, len); - if (pd == NULL) { + if (!pd) { peer->pdg_size--; retval = -ENOMEM; goto unlock; @@ -1229,7 +1229,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) } ptask = kmem_cache_alloc(fwnet_packet_task_cache, GFP_ATOMIC); - if (ptask == NULL) + if (!ptask) goto unlock; skb = skb_share_check(skb, GFP_ATOMIC); @@ -1443,7 +1443,7 @@ static int fwnet_probe(struct fw_unit *unit, net = alloc_netdev(sizeof(*dev), "firewire%d", NET_NAME_UNKNOWN, fwnet_init_dev); - if (net == NULL) { + if (!net) { mutex_unlock(&fwnet_device_mutex); return -ENOMEM; } -- 2.10.0