Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 23 Jun 2022 09:54:17 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     Felix Schlepper <f3sch.git@outlook.com>
Cc:     gregkh@linuxfoundation.org, linux-staging@lists.linux.dev,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 3/3] Staging: rtl8192e: Cleaning up error handling
Message-ID: <20220623065416.GO16517@kadam>
References: <cover.1655909205.git.f3sch.git@outlook.com>
 <AM9P190MB1299C167B21A1FAA157AF1C7A5B29@AM9P190MB1299.EURP190.PROD.OUTLOOK.COM>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <AM9P190MB1299C167B21A1FAA157AF1C7A5B29@AM9P190MB1299.EURP190.PROD.OUTLOOK.COM>
User-Agent: Mutt/1.9.4 (2018-02-28)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: BbywtCUuNevpm2ESbJ1uhK7t4ao1NBttpg5FQLHZJa0OhKYfvK2ZmjzKDaL1WrUvlbKGBQkEPnDEcm6IzWxeXJW47RPnqzLCdmRILWW+JIVOT6lz1aY0k47WendRR7NeYg8sVGZAImtLJZB2AXwaiykV/bLMKiHGxIGDBICsEOgRWRjI2c34DEo0iuPIOhEH37conp6ZRCELzhmORCF3mrwJsquEAC0tTxdWahC5oJWK77hP9qTf+xNvmw9wdNMizOTVN/fnfTi6VTTHu5X2rUySPS7T8mT7NoFglzExbGXxJj5cBHkHs8OUV4uqXCur5gejea8G0JaeXOknlWiOM/hgfCO+9P2z6ddH9fYFfBzmxXiyBBb7EpMI8+v9OR3veMEfSPM7ktbL5cQGsVbqUsBC6idyGHLBOSoQnkLmfdeNl245sSoh5YCtSqk8QBpa4pnwVdIWo1QGqh5j3OAWMAIeyq8H2mWlojJuLXmQeqdGy+J0NWpDqaW+hgV9cncILzrPpmXBC3e5oVgVJwJjYASVyMhr7C2z3vbSVf2uci2eWj8CP0PHDW87HujgCZqwfBUjtVG8h5c/r3STRCZXfJGS3YKbm/oBueau/JshyAviUYXS5hvp9H1ng7uL43xbteGQkCdVPVlu6S7/wsTdRtCpb4dvRBTE5tnPwtggTLwL243eD2TA4vJglZKv3wKFQncHSoJMWFyoVjHtXFM2Jdz3r/Nr25dwnhqhUP2APTv2f7Jh4jWEq++3zqbVXFKh
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f4160b23-8d58-4cee-3cb8-08da54e53bcc
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 06:54:35.6174
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yidp1Kmv6QLG65nDdOPlbr4NwCuWaz+JvTZ8YqwM8OZ36z+Afo8UNch/mpfqUjygPy/nxmfPkEEujxyUQT7GdQsQl7Z0ez1Z13lPQJ5E9kM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1734
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-23_03:2022-06-22,2022-06-23 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 phishscore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206230025
X-Proofpoint-GUID: MRyYqH6DJI4khLgz3UwVtvNxckONZdRt
X-Proofpoint-ORIG-GUID: MRyYqH6DJI4khLgz3UwVtvNxckONZdRt
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Jun 22, 2022 at 05:12:46PM +0200, Felix Schlepper wrote:
> This error handling is more readable and reduces code size.

There isn't a reduction in code size.

> 
> Signed-off-by: Felix Schlepper <f3sch.git@outlook.com>
> ---
>  drivers/staging/rtl8192e/rtllib_tx.c | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
> index 1307cf55741a..b246f5e0cad7 100644
> --- a/drivers/staging/rtl8192e/rtllib_tx.c
> +++ b/drivers/staging/rtl8192e/rtllib_tx.c
> @@ -214,19 +214,18 @@ static struct rtllib_txb *rtllib_alloc_txb(int nr_frags, int txb_size,
>  
>  	for (i = 0; i < nr_frags; i++) {
>  		txb->fragments[i] = dev_alloc_skb(txb_size);
> -		if (unlikely(!txb->fragments[i])) {
> -			i--;
> -			break;
> -		}
> +		if (unlikely(!txb->fragments[i]))
> +			goto err_free;
>  		memset(txb->fragments[i]->cb, 0, sizeof(txb->fragments[i]->cb));
>  	}
> -	if (unlikely(i != nr_frags)) {
> -		while (i >= 0)
> -			dev_kfree_skb_any(txb->fragments[i--]);
> -		kfree(txb);
> -		return NULL;
> -	}
> +
>  	return txb;
> +
> +err_free:
> +	while (--i >= 0)
> +		dev_kfree_skb_any(txb->fragments[i]);

There needs to be a kfree(txb);

regards,
dan carpenter


> +
> +	return NULL;
>  }
>