From nobody Mon Apr 20 01:10:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE1C6C43334 for ; Fri, 24 Jun 2022 13:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232107AbiFXNzN (ORCPT ); Fri, 24 Jun 2022 09:55:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231898AbiFXNzI (ORCPT ); Fri, 24 Jun 2022 09:55:08 -0400 Received: from relay.uni-heidelberg.de (relay.uni-heidelberg.de [129.206.100.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FCD346653 for ; Fri, 24 Jun 2022 06:55:03 -0700 (PDT) X-IPAS-Result: =?us-ascii?q?A2BIBQA6wbViffxkzoFaHgEBCxIMggQLhHyUEAEBAQaMb?= =?us-ascii?q?wOHHIwuAQEBAQEBAQEBCUIEAQFAig8nNwYOAQIEAQEBAQMCAwEBAQEBAQMBA?= =?us-ascii?q?QYBAQEBAQcEFAEBIzwnhXWGQwYyAUYQUVcZgngCAQGCZgEDMK0vgQGGWQGBP?= =?us-ascii?q?4FlgT0BiVaFH4FAgRCBFTODNYURhW4EmUcKAwkEBwVGFxJOMSECRQscAQgGB?= =?us-ascii?q?gcBCAEFCCgEAgEBAQYFGBQBAwEBExIFEwwHKAoSAhIMChsHBwMLBTINAg4HA?= =?us-ascii?q?QEMDwECDwMBAhEBBwIJEggGDysIAwEBAwEHAQICAyALAgMWCQcIAgECBQICA?= =?us-ascii?q?QMPAQgKHBIQFAIEDQQeCQIIAQIZHiwHAgIEDgMjHQgLCgMOAwQDARACGAcCA?= =?us-ascii?q?RUBBQIECAQBAwYDCBUZAQ0nBAcDEgINAQYBAgYBAQUFAQMYCAMUAwUBAggDF?= =?us-ascii?q?gcBAiEFCiYJBA0DASIbAgMDAQQbCgIBAgIFFgUCAQECAwIGFQYCAj8vER0NC?= =?us-ascii?q?AQIBAkSHCMBAgwBBAECBy8FBC0CAQEeBAUBBQ8CCAEBFgIGBAMCAgMBAQIBF?= =?us-ascii?q?gIQCAIIJxcHEzMZAQU3FA4PAQMGCBkcIgcJBwUGFgMOFSceKQUHERIbDwQND?= =?us-ascii?q?Qo0IBYkAQEOBQMBEhkRDgcUClMmIRUQBgErFgMEAQMDAgYcAQIDJQISBg4FA?= =?us-ascii?q?SIdGZp8E4EOxCkHg1EQAaA1lmICkgAtlkOiboRONYFCM4FMTSODOFEZD5xyc?= =?us-ascii?q?zsCBgsBAQMJjwEBAQ?= IronPort-Data: A9a23:UnO6TKB0ZtIXrhVW/6Ljw5YqxClBgxIJ4kV8jS/XYbTApGxx1zVUz jBKUGvTM/veZGv3f48jO9jl/E4H78LUy9NrOVdlrnsFo1Bi8JeaX4THci8cHM8wwunrFh8PA xA2M4GYRCwMZiaA4E/raNANlFEkvU2ybuKU5NXsZ2YgH2eIdA970Ug5w7Bj3tYy6TSEK1rlV e3a8pW31GCNhmYc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pHTU2FFEYUd6EPdgKMq 0Yv+5nilo/R109F5tpICd8XeGVSKlLZFVDmZna7x8FOjzAazhHe3JrXO9IdN3ZuqBOvrup/x dhTq4buYDt1EoDlzbF1vxlwS0mSPIVD8b7DeSH5rMqSik3Lcnfhx/9jFk5wMYBwFuRfWDsfs 6ZAdnZUNkjF3b/sqF64YrAEasALN8LrOI4Honx65SrFEPpgXJbCBqXH5NNV2D09nM8IEfu2i 88xMGQyNUuQPUMRUrsRILQErriixWPuSWFR60qlrvUMyELO4jUkhdABN/KOJoLWH5wN9qqCn UrJ5Wn2AREyMN2Z1CqL9W+qiubTnCT9HoUIG9WQ8v9snU3W3XAaBxwQWnO/oOKlkQi6WtRCO woY9zRGhaZp70erCNb8QzW/vWKAuRkfHdFXFoUS7ACL17qR4AuDAGUAZiBOZcZgt8IsQzEuk FiTkLvU6SdHtbSUTSrEsKqSrHayNCkZIGsIaDULCwcIizX+nG0tphORf+9ANoiEtNP4FC/u2 W6jkHQSqpxG2KbnyJ6H1VzAhjutoL3AQQg0+hjbUwqZAuVROdHNi2uAtAmz0BpQEGqKZgXQ4 CFcxKBy+MheU8HVzURhVc1QROnB2hqTDNHLqXJCd3XL3xSg+nKueYpd+j4WyKxBbJddI2eBj KP7kwpd6ZkWA9B+d7Nrboe7Bt4lpZUM+PzgX/HQNoMIf55wMQ+K/S1jYUSdxW+rnEVEfUAD1 XWzL5bE4ZUyUPoPIN+KqwE1iuNDKscWmTq7eHwD5077uYdynVbMIVv/DHOAb/oi8ISPqxjP/ tBUOqOikksCDrWmM3GNoNZIdjjmyETX47io8aS7kcbdfGJb9J0JVKe5LU4JIdQ0wvoMyI8kA FnkAhMGlDITekEr2S3RNi4/Muq3NXqOhXg2OTMxMB613Xk9bJy07bsOP506YaYg7u8L8BKHZ 6ZtRil0OdwREW6v02pGMvHAQHlKLknDafSmY3H4OlDSvvdIG2T0xzMTVlG+qnBQUnXm7pVWT n/J/lqzfKfvjj9KVK7+AM9DBXvr1ZTBsIqeh3f1H+Q= IronPort-HdrOrdr: A9a23:+zj75qDIQ4/UplnlHemN55DYdb4zR+YMi2TDtnoBMCC9F/byqy nAppomPHPP5Qr4dhkb+Oxoe5PwI080lqQFgrX5X43SOjUO0VHAROtfBODZrAEIdReTygcT79 YET0HSMqyVMXFqyezByE2TFdI4xdmO96qlwd3Z02xmQWhRC52Iqz0JbTqmLg== X-IronPort-Anti-Spam-Filtered: true Received: from mail01.uni-heidelberg.de ([129.206.100.252]) by relay.uni-heidelberg.de with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 24 Jun 2022 15:55:00 +0200 Received: from localhost (ip2505f6aa.dynamic.kabel-deutschland.de [37.5.246.170]) (Authenticated sender: ln194) by mail01.uni-heidelberg.de (Postfix) with ESMTPSA id 82C1330011A56; Fri, 24 Jun 2022 15:55:00 +0200 (CEST) From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v5 1/3] Staging: rtl8192e: Use struct_size Date: Fri, 24 Jun 2022 15:54:53 +0200 Message-Id: <54ea62a2b7628d3bdd5aa52df82c3e91704a2127.1656078068.git.f3sch.git@outlook.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Using struct_size is encouraged because it is safer than using sizeof and calculations by hand. Signed-off-by: Felix Schlepper --- drivers/staging/rtl8192e/rtllib_tx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 37715afb0210..f2ef32e943ae 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -205,8 +205,7 @@ static struct rtllib_txb *rtllib_alloc_txb(int nr_frags= , int txb_size, struct rtllib_txb *txb; int i; =20 - txb =3D kmalloc(sizeof(struct rtllib_txb) + (sizeof(u8 *) * nr_frags), - gfp_mask); + txb =3D kmalloc(struct_size(txb, fragments, nr_frags), gfp_mask); if (!txb) return NULL; =20 --=20 2.36.1 From nobody Mon Apr 20 01:10:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B35CC433EF for ; Fri, 24 Jun 2022 13:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232153AbiFXNzR (ORCPT ); Fri, 24 Jun 2022 09:55:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232093AbiFXNzM (ORCPT ); Fri, 24 Jun 2022 09:55:12 -0400 Received: from relay.uni-heidelberg.de (relay.uni-heidelberg.de [129.206.100.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 023C246152 for ; Fri, 24 Jun 2022 06:55:08 -0700 (PDT) X-IPAS-Result: =?us-ascii?q?A2DwBAA6wbViffxkzoFagliEfJQQAQEBBoxvA4cciieCB?= =?us-ascii?q?wEBAQEBAQEBAQlCBAEBPQECig8nNgcOAQIEAQEBAQMCAwEBAQEBAQMBAQYBA?= =?us-ascii?q?QEBAQcEFAEBIzwnhXWGQwYnCwFGEFFXGYJ4AgEBgmYBAzCsfTKBAYZZAYE/g?= =?us-ascii?q?WWBPYlXhR+BQIEQgRUzgzWFEYVuBJlHCgMJBAcFRhcSTjEhAkULHAEIBgYHA?= =?us-ascii?q?QgBBQgoBAIBAQEGBRgUAQMBARMSBRMMBygKEgISDAobBwcDCwUyDQIOBwEBD?= =?us-ascii?q?A8BAg8DAQIRAQcCCRIIBg8rCAMBAQMBBwECAgMgCwIDFgkHCAIBAgUCAgEDD?= =?us-ascii?q?wEIChwSEBQCBA0EHgkCCAECGR4sBwICBA4DIx0ICwoDDgMEAwEQAhgHAgEVA?= =?us-ascii?q?QUCBAgEAQMGAwgVGQENJwQHAxICDQEGAQIGAQEFBQEDGAgDFAMFAQIIAxYHA?= =?us-ascii?q?QIhBQomCQQNAwEiGwIDAwEEGwoCAQICBRYFAgEBAgMCBhUGAgI/LxEdDQgEC?= =?us-ascii?q?AQJEhwjAQIMAQQBAgcvBQQtAgEBHgQFAQUPAggBARYCBgQDAgIDAQECARYCE?= =?us-ascii?q?AgCCCcXBxMzGQEFNxQODwEDBggZHCIHCQcFBhYDDhUnHikFBxESGw8EDQ0KN?= =?us-ascii?q?CAWJAEBDgUDARIZEQ4HFApTJiEVEAYBKxYDBAEDAwIGHAECAyUCEgYOBQEiH?= =?us-ascii?q?RmbD4EOgUTCZQeDURABoDWWYgKSAJZwom6ETjWBMws3gUxNI4M4URkPnHJzO?= =?us-ascii?q?wIGCwEBAwmPAQEB?= IronPort-Data: A9a23:KrJBhqKNiM92xgSkFE+RWpUlxSXFcZb7ZxGr2PjKsXjdYENS1zwCm GIYDDvUaP7eMGahc9FyOtng/UhVvMOGy95lHVAd+CA2RRqmi+KcWIvDfhmsV8+xwm8vaGo9s q3yv/GZdJhcokf0/0vrav67xZVF/fngqoDUUIYoAQgsA14+IMsdoUg7wbRh3NQ02YLR7z6l4 LseneWOYDdJ5BYpagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfnZw0/Df2VhNrXSq 9AvbF2O1jixEx8FUrtJm1tgG6EAaua60QOm0hK6V0U+6/RPjnRa70o1CBYTQR9IgCmYkf519 OhEvsauEgEbPJeVmM1IBnG0EwkmVUFH0LrOIHzn6IqOyUyDc3btz/hqBkwsMssU946bA0kXr 61ecmhTKEnb36TsnejTpupE36zPKOHwN4Mbt2l4wCvxFuo7TdbeRaSP5dJZ0Do0jM1UErDSa qL1bBI2MkmZPE0RZQ9/5JQWm7ezwSD0enpjp0uvp5gGx0LM3jVV+e24WDbSUofWG5kPxx7wS nj912vjDx4ZNPSbyDyY4nyrm+nDlD/6X4RUE6e3ntZugVuO1ikIFBQZVF20if24kVKlHdZeL VEEvCYjs8Aa+hewRdm7UBykiHmZohobXNkWGOo/gCmJy6zJ80OaC3ICQzppdtMrrok1SCYs2 1vPmMnmbQGDq5WQQHOZru7SsDWzfCgYLGMPYSUJVwRD79SLTJwPYgznFsloDL+7oNnJJDj7m S7Rqho8vewTpJtev0mkxmzvjzWpr5nPawc64ATLQ26ohj+Vgqb4OOREDnCGvJ59wJalokqp4 ClYwpDBhAwaJcHTxHTUKAkYNOzxv5643CvgbUlHM7RJG96F23OicY1U6jxkKy+F2e5aKGazO Cc/VSt77ZNeOj6Vxnttf568Ds4n16eIKDgIfvXdb94WO95scg7C/CxvaUOU1W33nw4gnMnT2 Kt3k+7yXR726ow+klJaotvxN5dwmkjSIkuPHPjGI+yPi+b2WZJsYe5t3KGyRu449riYhw7e7 sxSMcCHoz0GDrCgOnGGqdRCdQtRRZTeOXwQg5INHgJkClQ4cFzN99eOmdvNhqQ/x/UIyL6Wl p1DchYAlASj7ZE4Fel6Qis/Nu+1BM4XQYMTNyEoIkulk2UlYJii9rwea4p/e7Q76+t5zpZJo wotJK297gB0YmqcoVw1M8KixLGOgTzx2GpiyQL5O2VlF3OhLiSVkuLZkvzHrnhQV3Tr6ppl/ dVNFGrzGPI+euirN+6OANrH8r97lSF1dD5aN6cQHuRuRQ== IronPort-HdrOrdr: A9a23:QRT4sKGk2ddMwRW3pLqE0ceALOsnbusQ8zAXPiFKOGVom6mj/f xG885rsCMc5AxhOk3I3OrwW5VoIkm8yXcW2/h0AV7KZmCP01dAbrsD0WKI+UyGJ8SRzJ866U 6iScRD4R/LYGSSQfyU3OBwKbgd/OU= X-IronPort-Anti-Spam-Filtered: true Received: from mail01.uni-heidelberg.de ([129.206.100.252]) by relay.uni-heidelberg.de with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 24 Jun 2022 15:55:02 +0200 Received: from localhost (ip2505f6aa.dynamic.kabel-deutschland.de [37.5.246.170]) (Authenticated sender: ln194) by mail01.uni-heidelberg.de (Postfix) with ESMTPSA id 4005830011A5C; Fri, 24 Jun 2022 15:55:02 +0200 (CEST) From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v5 2/3] Staging: rtl8192e: Using kzalloc and delete memset Date: Fri, 24 Jun 2022 15:54:54 +0200 Message-Id: <9727fe31c675f2f3052ca2fa586d137dd856ac91.1656078068.git.f3sch.git@outlook.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" By using kzalloc, we can delete a memset. The practical difference is that using kzalloc() will zero out the txb->fragments[] array. The original code worked fine, but zeroing everything seems nicer. Signed-off-by: Felix Schlepper --- drivers/staging/rtl8192e/rtllib_tx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index f2ef32e943ae..1307cf55741a 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -205,11 +205,10 @@ static struct rtllib_txb *rtllib_alloc_txb(int nr_fra= gs, int txb_size, struct rtllib_txb *txb; int i; =20 - txb =3D kmalloc(struct_size(txb, fragments, nr_frags), gfp_mask); + txb =3D kzalloc(struct_size(txb, fragments, nr_frags), gfp_mask); if (!txb) return NULL; =20 - memset(txb, 0, sizeof(struct rtllib_txb)); txb->nr_frags =3D nr_frags; txb->frag_size =3D cpu_to_le16(txb_size); =20 --=20 2.36.1 From nobody Mon Apr 20 01:10:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C82CEC433EF for ; Fri, 24 Jun 2022 13:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232064AbiFXNzK (ORCPT ); Fri, 24 Jun 2022 09:55:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229786AbiFXNzH (ORCPT ); Fri, 24 Jun 2022 09:55:07 -0400 Received: from relay2.uni-heidelberg.de (relay2.uni-heidelberg.de [129.206.119.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1297946152 for ; Fri, 24 Jun 2022 06:55:04 -0700 (PDT) X-IPAS-Result: =?us-ascii?q?A2DwBAA6wbViffxkzoFaHgEBCxIMggQLhHyUEAEBAQaMb?= =?us-ascii?q?wOHHIonggcBAQEBAQEBAQEJQgQBAT0BAooPJzYHDgECBAEBAQEDAgMBAQEBA?= =?us-ascii?q?QEDAQEGAQEBAQEHBBQBASM8J4V1hkMGJwsBRhBRVxmCeAIBAYJmAQMwrH0yg?= =?us-ascii?q?QGGWQGBP4FlgT2JV4UfgUCBEIEVM4M1hRGFbgSZRwoDCQQHBUYXEk4xIQJFC?= =?us-ascii?q?xwBCAYGBwEIAQUIKAQCAQEBBgUYFAEDAQETEgUTDAcoChICEgwKGwcHAwsFM?= =?us-ascii?q?g0CDgcBAQwPAQIPAwECEQEHAgkSCAYPKwgDAQEDAQcBAgIDIAsCAxYJBwgCA?= =?us-ascii?q?QIFAgIBAw8BCAocEhAUAgQNBB4JAggBAhkeLAcCAgQOAyMdCAsKAw4DBAMBE?= =?us-ascii?q?AIYBwIBFQEFAgQIBAEDBgMIFRkBDScEBwMSAg0BBgECBgEBBQUBAxgIAxQDB?= =?us-ascii?q?QECCAMWBwECIQUKJgkEDQMBIhsCAwMBBBsKAgECAgUWBQIBAQIDAgYVBgICP?= =?us-ascii?q?y8RHQ0IBAgECRIcIwECDAEEAQIHLwUELQIBAR4EBQEFDwIIAQEWAgYEAwICA?= =?us-ascii?q?wEBAgEWAhAIAggnFwcTMxkBBTcUDg8BAwYIGRwiBwkHBQYWAw4VJx4pBQcRE?= =?us-ascii?q?hsPBA0NCjQgFiQBAQ4FAwESGREOBxQKUyYhFRAGASsWAwQBAwMCBhwBAgMlA?= =?us-ascii?q?hIGDgUBIh0Zmm8gexOBRJN4rm0Hg1EQAaA1lmICkgCWcKJuhE41gTMIOoFMT?= =?us-ascii?q?SODOFEZD5xyczsCBgsBAQMJjwEBAQ?= IronPort-Data: A9a23:UZY6FK6sPbwuOpiRlBCorAxRtKXHchMFZxGqfqrLsTDasY5as4F+v jMWXWrTa/yMM2D9ftl+Ydu19ElT65bQyIdkGVE/rSw0Zn8b8sCt6faxdxqvZXPMcqUvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EngZqTRMFWFw03qPp8Zj2tQy2YbjX1vX0 T/Pi5S31GGNimYc3l08tvrrRCNH5JwebxtB4zTSzdgS1LPvvyF94KA3fMldHFOgKmVgJdNWc s6YpF2PEsM1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXe345jXMfwZ3u7hB2tgdRu1 edWlKCIcl80GaTwxMsHEBhHRnQW0a1uoNcrIFC6uM2XlxSAbn3thvVjDU07OYcV4OkxDWwmG f4wcWpcKErb2aTvmOr9ELQ27iggBJCD0Ic3oXpgyTzBFfs8aYvfXqmM+NlZmTc9h8xDGfzTf cVfZTcHgBHoOkARaw1IUs5v9AuuriPSSjZKpwqKn61t30rf6xND7YbfH/OAL7RmQu0OwhjE/ Duel4jjOTkVLtGQyjqt9nOqm//Bmj79VIsOFbq+sPlwjzW7wm0VFQ1TTkeyrvi/hWa6WslDM AoQ+ywzve4++VLDZtemRBa45nGFojYbRsZUFOo5rgqKz8L85wefG3hBTTNbbtEinNE5SCZs1 VKTmd7tQzt1v9WopWm1876VqWvrfzUTLCoCaC4IQA8P7sPs5o0+5v7Scjp9OIqrisLoKyrR/ wix9DUZjolPotRI1rruqDgrnAmQjpTOSwc04CDeUWSk8h51aeaZi2qAtAezARFocdfxc7WRg JQXs5TPsLlWUvlhgATdHrVVRdlF8t7YaGW0vLJ5I3U23xiAk5JJVaBd4T1zIE1kKMlsldTBP h6K41s5CHN7FnKmYKkyXCllEdg2wK3qGM7qPs04g/JLa5l1LFbB4SdvIE6d3mzglEIhi655N ZrznSeQ4ZQyV/QPINmeHrl1PVoXKsYWnj+7qXfTk03P7FZmTCTJIYrpymemYOEj97+jqw7I6 dtZPMbi40wBDbOmOniPq99LdgtiwZ0H6Xbe9ZY/mgmrfFQOJY3dI6CJqV/cU9Y9zvkLz7mgE o+VAxcElgaXaYL7xfWiMSw9NOm2Bf6TXFoxMCgzIFvgxn4if4u196YDZtMxcKU48/ZgpcOYv NFaE/hs9s9nFG+dkxxDNsaVkWCXXE727SqUITGfaSQyF7Y4AVOUkjMSVle0qXNm4+venZdWn oBMISuBEMRaGVg9XZ2IAB9tpnvo1UUgdCtJdxOgCrFulI/EquCG9wSZYicLHvwx IronPort-HdrOrdr: A9a23:+S/gpqkzBCbdZSkcJUV8eFEVXGfpDfIV3DAbv31ZSRFFG/Fw9v re5cjzsCWftN9/YgBEpTntAtjjfZqYz+8X3WBzB9aftWvdyQ+VxehZhOOI/9SjIU3DH4VmpM BdmsZFebvN5JtB4foSIjPULz/t+ra6GWmT69vj8w== X-IronPort-Anti-Spam-Filtered: true Received: from mail01.uni-heidelberg.de ([129.206.100.252]) by relay2.uni-heidelberg.de with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 24 Jun 2022 15:55:04 +0200 Received: from localhost (ip2505f6aa.dynamic.kabel-deutschland.de [37.5.246.170]) (Authenticated sender: ln194) by mail01.uni-heidelberg.de (Postfix) with ESMTPSA id D408330011A56; Fri, 24 Jun 2022 15:55:03 +0200 (CEST) From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v5 3/3] Staging: rtl8192e: Cleaning up error handling Date: Fri, 24 Jun 2022 15:54:55 +0200 Message-Id: <13b32131cd00a1f0b8793657a24ada71240a8350.1656078068.git.f3sch.git@outlook.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Moved error handling to one common block. This removes double checking if all txb->fragments[] were initialized. The original code worked fine, but this is cleaner. Signed-off-by: Felix Schlepper --- drivers/staging/rtl8192e/rtllib_tx.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 1307cf55741a..42f81b23a144 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -214,19 +214,19 @@ static struct rtllib_txb *rtllib_alloc_txb(int nr_fra= gs, int txb_size, =20 for (i =3D 0; i < nr_frags; i++) { txb->fragments[i] =3D 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 !=3D nr_frags)) { - while (i >=3D 0) - dev_kfree_skb_any(txb->fragments[i--]); - kfree(txb); - return NULL; - } + return txb; + +err_free: + while (--i >=3D 0) + dev_kfree_skb_any(txb->fragments[i]); + kfree(txb); + + return NULL; } =20 static int rtllib_classify(struct sk_buff *skb, u8 bIsAmsdu) --=20 2.36.1