linux-kernel - [PATCH v3] staging: rtl8723bs: tidy up error handling

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20220408144442.17611-1-hanyihao@vivo.com>
Date:   Fri,  8 Apr 2022 07:44:40 -0700
From:   Yihao Han <hanyihao@...o.com>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Fabio Aiuto <fabioaiuto83@...il.com>,
        "Fabio M. De Francesco" <fmdefrancesco@...il.com>,
        Xiangyang Zhang <xyz.sun.ok@...il.com>,
        Yihao Han <hanyihao@...o.com>,
        Lee Jones <lee.jones@...aro.org>,
        Bryan Brattlof <hello@...anbrattlof.com>,
        linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org
Cc:     kernel@...o.com
Subject: [PATCH v3] staging: rtl8723bs: tidy up error handling

The check for if rtw_skb_alloc() fails is done twice and is written
in a confusing way.  Move the "if (!recvbuf->pskb)" right after
the allocation.  The "if (recvbuf->pskb)" check can now be deleted
and the code pulled in one tab.

Suggested-by: Dan Carpenter <dan.carpenter@...cle.com>
Signed-off-by: Yihao Han <hanyihao@...o.com>
---
v2: more extensive cleanup
v3: edit commit message
---
 drivers/staging/rtl8723bs/hal/sdio_ops.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index a545832a468e..107f427ee4aa 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -811,17 +811,14 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size)
 		SIZE_PTR alignment = 0;
 
 		recvbuf->pskb = rtw_skb_alloc(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
-
-		if (recvbuf->pskb) {
-			recvbuf->pskb->dev = adapter->pnetdev;
-
-			tmpaddr = (SIZE_PTR)recvbuf->pskb->data;
-			alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
-			skb_reserve(recvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
-		}
-
 		if (!recvbuf->pskb)
 			return NULL;
+
+		recvbuf->pskb->dev = adapter->pnetdev;
+
+		tmpaddr = (SIZE_PTR)recvbuf->pskb->data;
+		alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
+		skb_reserve(recvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
 	}
 
 	/* 3 3. read data from rxfifo */
-- 
2.17.1