From nobody Mon Apr 20 01:10:18 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 62CFBC433EF for ; Thu, 23 Jun 2022 20:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229609AbiFWU3W (ORCPT ); Thu, 23 Jun 2022 16:29:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229837AbiFWU3T (ORCPT ); Thu, 23 Jun 2022 16:29:19 -0400 Received: from relay.uni-heidelberg.de (relay.uni-heidelberg.de [129.206.100.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E049C53A7D for ; Thu, 23 Jun 2022 13:29:17 -0700 (PDT) X-IPAS-Result: =?us-ascii?q?A2D0BQCJzLRiffxkzoFaHgEBCxIMggQLhHyUDwEBAQaMb?= =?us-ascii?q?QOHHIwuAQEBAQEBAQEBCUIEAQFAig8nNwYOAQIEAQEBAQMCAwEBAQEBAQMBA?= =?us-ascii?q?QYBAQEBAQcEFAEBIzwnhXWGQwYyAUYQUVcZgngCAQGCZgEDMK1wgQGGWQGBP?= =?us-ascii?q?4FlgT0BiVWFH4FAgRCBFTODNYURhW4EmUMKAwkEBwVGFxJOMSECRQscAQgGB?= =?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?Qo0IBYkAQEOBQMBEhkRDgcUClMmIhUQBgErGAMEAQMDAgYeAQIDJQIZBQEiH?= =?us-ascii?q?RmadxOBDsQqB4NREAGgNJZiApIALZZDom2ETjWBQjOBTE0jgzhRGQ+ccnM7A?= =?us-ascii?q?gYLAQEDCY8BAQE?= IronPort-Data: A9a23:zOtco6/WHMXq1wVAO9wtDrUDCX6TJUtcMsCJ2f8bNWPcYEJGY0x3y mFNWm3QbqqJMzT2Lt5xa9nn9U0DvcXVyYA1G1c4+H9EQiMRo6IpJ/zAcxiqb33ORiHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsYkidfic5DnZ74f5fs7Rh2NQw34LiW1nlV e7a+qUzBnf0g1aYDUpJs8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByOQrr1vIwKPb 72rIIdVXo/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8A/+v5TCRYSVatYo2SgsspQ7 OphjriTQzVuF6vhs79adRYNRkmSPYUekFPGCX22sMjLlgvbdXqpw/hvAEwyN4AC9aB7DAmi9 9RBcmFLNEjdwbvumPThF7MEascLdaEHOKsEsXFkwCnBAOwOWozeT+PX494d3Doxis1KF/vEa IwVZFKDaTyZPUAXaw9HV8xWcOGAqSLUSj1VpGivm40J2HqIyQdq8orBGY+AEjCNbZ4JwBrC/ zquE37CKh4AOdOcyRKB83SxluHIgCX3UZ4TE7v+8eRl6HWXx2oOGFgNSVK0oP+2okq/QM5Eb UgV/Dc+66Q/6iSDQILmVB3+r3+YlhkBR95XFO584waIooLQ4gCEFi0HQyRHZdgOqsA7X3op2 0WPktevAiZg2IB5UlqY/7aQ9Wr0JC4UaG8PZCMJSQEI+dalrIxbYg/zoshLQYeYlPzRJh3L5 xOAnm8XgZg41okt2PDulbzYuA6Eqp/MRw8zwwzYWGO58w90DLJJgaT1tjA3Ct4dfe6kokm9U Gssx5nCtbhRZX2ZvHzTEL1UdF28z6vdaFXhbUhT844J2xnFF5SLXY1R7Dx6LkpzPa7okhe3M RaJ4Wu9CLd5NXena+pIyFarF9gnyKLtD9uNaxw5Rt9HY5wpLUma+iArZUOR023pmkU2nuczN P93kPpA715EWcyLLxLvGY/xNIPHIAhlmQs/orinlnyaPUK2PiL9dFv8GALmghoFxK2Fuh7J1 N1UKtGHzR5SOMWnPHSJqdZCdQpbdSNgbXwTlyCxXrDZSuaBMD9/Y8I9PZt+I+SJYowPzraVo CjjMqOm4AOn2SObQel1VpyTQOizA8ol9CpT0d0EN1usxGUuKZup7bkSbYA2Yahv8uF/0vluT JE4lzaoXZxypsD802pGN/HV8tc9HClHcCrUYkJJlhBjJMM6L+EIk/e4FjbSGN4mX3Xm5JNj/ eXIO8GyacNrejmOxf3+MJqHp25dd1BD8A6udyMk+uVuRXg= IronPort-HdrOrdr: A9a23:E50h2KqXUHyPP8IhgMFUTr4aV5o8eYIsimQD101hICG9vPb1qy nIpoV+6faaslgssR0b8+xofZPwIk80lqQFhLX5Q43CYOCOggLBR72Kr7GSoQEIcBeQygcy78 pdmtBFaOHNMQ== 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; 23 Jun 2022 22:28:01 +0200 Received: from localhost (ip-037-209-006-204.um11.pools.vodafone-ip.de [37.209.6.204]) (Authenticated sender: ln194) by mail01.uni-heidelberg.de (Postfix) with ESMTPSA id C156030011A56; Thu, 23 Jun 2022 22:27:59 +0200 (CEST) From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v4 1/3] Staging: rtl8192e: Use struct_size Date: Thu, 23 Jun 2022 22:27:53 +0200 Message-Id: <54ea62a2b7628d3bdd5aa52df82c3e91704a2127.1655975970.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:18 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 EF2F0C433EF for ; Thu, 23 Jun 2022 10:06:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230381AbiFWKGZ (ORCPT ); Thu, 23 Jun 2022 06:06:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbiFWKGK (ORCPT ); Thu, 23 Jun 2022 06:06:10 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066039.outbound.protection.outlook.com [40.92.66.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0663849CB6 for ; Thu, 23 Jun 2022 03:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MBDzWq0h+vr3r204eLy8be/P/b5eVcMxrPfY5a+0j/B7X+3iNpTaHgSib8tw2kvoNOdSC94C3nkBhEBEwWLqN2kAWmjC2pdaKc4t8/ppAD4+tZwjtq1daSyzzeVQd3nqtiD+Ggq9QLTwOWbx4hJkPOZqmUbGJuhpJN5VpqKJW4mmIuO8FyfMUr723Hk889ebsmorhnOrf3EDKECFrP2QCFAYiyV+6E15kvMjKlq3V0tHI63bhw6ywi4rYzNCtDhQSp1FYKUhrzCIRSdgmEdzw6Yj00rTmQHrwbNkqzFy6Nyhe4sNI0nM/t2FjnPkqXg+B99IEwuqHN7Qcm4MsOGRQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zVFFf2YPFHvBQg+aepMbzCOIcZg6Aa66AzPHUIYDW4E=; b=GuHAHTblhF2WsqHM92tytQPZydhH6AQb1PrgDulzDMRrR8fzqvwRonLMcNAnl2IgzLnXdogFlR7T1FKpwUOG5/TQ7KxWtwN6+eaK9A205N+xBBtFSbrhtTAJ+I4qo2tI8HZSFHpM9NaHMyj7iizJdnNo1ralDYCbMpJ3MsSZcK02ODg3bAkG0BSJqvzxdotOkjlce2cNefIZmHcnXrv8dtu+89WdeY/bJhtdEAMWmyLm8tjK+zn0FLfT57NHNsXGn5KbLo8gbJ4bD7bAjsRVhssxIIk5C96v9mMCBp/eiTXaaFKDXSF/366/z974wrsE7Ft8pZzgA2seC+3DugOCfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zVFFf2YPFHvBQg+aepMbzCOIcZg6Aa66AzPHUIYDW4E=; b=lLuivtSuPao4RSV9yYe2LVvibjOyieZY81CLCPWanVjQRmpb4sKEaYDW7u39Lk8VwqbKYrjyRYdJe7eFs79HQVUJS2DKEnYT/25SzNVMfDDux9e7PHxbnePuTMrp+vqr7127ZaKzgeavWPlUuO8POLXGcuAlErVi5x7BkhvJ4rYe6SE2b4cB9KYklxtLFfLqLFkLAT2mFYVxZhwQifA1UykJksMrC4s5eLkYK7+nR5TU1VS8Du1Y0Q8tes+cYuCqXGZq9DJC68G+025dfYO2awIj2Inc1Mf1Ok1ZT8FBZiogCD1nd4zRiXsYYRMZ/4c/ZKzlV8cBbqGsWy+6oHuiRA== Received: from AM9P190MB1299.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:267::9) by DB6P190MB0263.EURP190.PROD.OUTLOOK.COM (2603:10a6:6:32::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Thu, 23 Jun 2022 10:06:06 +0000 Received: from AM9P190MB1299.EURP190.PROD.OUTLOOK.COM ([fe80::c0f4:a98e:332a:2397]) by AM9P190MB1299.EURP190.PROD.OUTLOOK.COM ([fe80::c0f4:a98e:332a:2397%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:06:06 +0000 From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v4 1/3] Staging: rtl8192e: Use struct_size Date: Thu, 23 Jun 2022 12:05:55 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-TMN: [7sXhUuv257+aRESGD8u3S+WKSgG4GTfO] X-ClientProxiedBy: AM6PR10CA0038.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::15) To AM9P190MB1299.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:267::9) X-Microsoft-Original-Message-ID: <54ea62a2b7628d3bdd5aa52df82c3e91704a2127.1655975970.git.f3sch.git@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dc78836-cf43-486c-bab5-08da54fffcc0 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WokJw9qhnqKg7+E0MqObEIk6jipd4eOFDx/Oyu+Wl7XZFcDsLTGz/FusbHL0KrB7kgM5NGzDhYXQLXEXRiVzV8brAAvMLlX0Z9wGpukV8JFJNMYlz5LgvwPj+lF+En6+M1WkrTbS6axmiUgKsUHLAmv1o2gaC48JM1BvFOmX38i7RaGC+40WU83Cl9+uB7UM0/73sMNS/LRt7EgYg4x+AMZFhLuVu6+mcoLLe5oPKVHRdthDM/Mcpc7t8IuFwL1pCmSRk6b8oq0xNjQAsFz6rEFjKUukm8pdl5DaIKTfo9p/2qMbPhq4+Ug1pViRWVnnG3F8CSKqAyoT4vBheBfOp1SceLvXfOIzlykHnLikYCHg9zWHQ5O+5LfOvxyaiFaLORHuEQImsmb45AmtpCA/W+Uu1tgHUV39q6V9TPbpwDlcJrQ4O3D3tx+N0N3A/CKLoU1/98TDWuzyq58IdRTgM4z/THM8Xya8GF61JCa+UtyhdqM4vDY4oou0LZO1p5WJZG9xX17rSb5lI5BdVbO7BtozazfZWULa9SH7Yzvp7sBmwloDTMGY8R6bvMVDTVrqiAQL5x7VmtWNwYWrm4rIoOTFMfLMo+/O/U7Jq1rTBnJH27zhDGSLCJa6MkJQt7kXMRRdpyz5/kvcIgIP2mvc9N57xP/loyxz20ww+YCf87rHgOl2JAwcjsDlLAiAORgtTzaeJA1Mi5TIYGWGPR3IjHfvj2XljnxzHPzO13w2u3q0naMX3LI546u5rQeISk/qlT4= X-MS-TrafficTypeDiagnostic: DB6P190MB0263:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: frZpBci9S1A70MFVabPjQkmBtMGFpMatWPPWz83UsjeK7cwJYWP5fjvqcszeleaGvDtOeozrJ3W0Ba8Lu/9LCWaNsPiMOrYHu5WJ0nJyyALrheULkxC0S//V5KSXydl7cQv3tb7TC87ZrQSXsmvrVQYIK2mg2PxpvrVjXh6TchyUZLK2/dT2Tgth9Zivqe7pe7sTi95tLpcse04nL97xAKwg10253/miu6RAZrGkL24ofa+M4piEkpheuuqBjFw3JY5m7c8EHYb6f/mdK7Yuk17Bn7y2Y+WwePpfouAABSBk6mvy7RbZho41Q+3jQp31RQIgxO1xVXo/QG4m6pAjXnVTjXfutZfP8Iy8X2kOnsmOXfPugWRQE3t6/hz4m69cXunoEJ4M/UYeo81wc2PprQTbPbkI1nqzpG+GFbpnJnyQ5c6oOGWjyDzM5JPb21abkMqHrwnNKjflNtLmiAxzG/WQoreyp1rtd+/rGYvgchwyhrx5u892KpRIg/DDXUFyey5RsRY6VmsbF2lLOtVU/C3RX/J70E911YodaV5zRA8l+MH4vOqZeYdWPbb4wlZuq2bDs44xkdOmhqqq4YpCVTRz6L3oLkocnAvNGyxr3FHWYyZbk/+fJPe8nly/6G9+OcpWsdnsxWd1CXdXqOhTOQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mmuRsxewlyP0zbmRIMoEFGhYujjBTJMhz8LypcXRZahpePaSXhuDlrfOOUSl?= =?us-ascii?Q?xvSOw20U3ZQiBsvwvO1w0GrlTEmHPaCsuSQ630/ANkwbugeMfy4+ViLeT6+s?= =?us-ascii?Q?IjsAiyR9AQgsIRMNdpEvqsroU8S0cWU9KI7JM/U1QmwSfnUhhObrEcpd2AI0?= =?us-ascii?Q?41cnr9hjljn03P+TGKQJYJlYuk44A15zplUShps/3cF6xb1RRI7CJ/kLoC5P?= =?us-ascii?Q?/3IyMMgQd2c85Lkl4PHML+NKxuWUYPZ3smMKoPUWsd2szM6gCsUrHq4SA62S?= =?us-ascii?Q?dGrpW9oAVZKstGInD1oMUqgwF8w/bjgjyVroHpMEBi5ifbpoWH57cjaS7a05?= =?us-ascii?Q?5YLI6WnBPKlP5tWAUPW4pJQT6Bbr11W5AY7v3zC4ent6Ux3jcWMxtXjwNnXv?= =?us-ascii?Q?mqBRIaIzkcFp4Bab5zLtuz92qoK7pQQW0X3iMJNZ0H7eBfHBUC9n+Vc/8daq?= =?us-ascii?Q?LLRmcMKCqqS54AzHvtvw/kFn4j3LGpZo1W4vkL2JZL3cIXqcCbzh1XvIgMED?= =?us-ascii?Q?N7walDXXmqF/qWpcEU+jSAExvsbtu0avZRpGGa8SCshc+zwgNH8GlHnRBWKn?= =?us-ascii?Q?wH1Q1EcD3sjZQvZzA9ZVsTb7/NcRUiuQpaI10NE0xTvQVv/WY9zUbX9YcIEg?= =?us-ascii?Q?xeRv+Pqq+jecdqubxv9W3FN/z3IZHS1XgyiF3E3EFEuPaXt3JZ85EBuX6iuF?= =?us-ascii?Q?ewe/bg+TpVftH0gJEIjOXhh46EmF52kdW2i1T6W8oNB5qWgzjRSSNnOELjLE?= =?us-ascii?Q?JvhIKgDilf6kvy6EJ9smgKQBKfHpVv//++pcUn1etBu9h3D2jV/vBOfUngCM?= =?us-ascii?Q?brphETOYF4RYXmR+XnGNJEo8IbFpNWTjy7cNQw3zJXh0N/BFIpCETcn0hBGu?= =?us-ascii?Q?cqFqBddPJiSi6r7TDn9PDiteDawJ+VqFqnikW72WhY6TXtwM60Y3YMqa9xdL?= =?us-ascii?Q?O4Eg+ahvAyr7M1y82Xv6kUtd6MpXVH5JgwaBzeeXeTvzoZXzAROOnOyOQyAA?= =?us-ascii?Q?GT7OZSDfRkmarwlCmSrSQ8pL+WhPJM8XsFuP2kW9upNNaKCQW2SW7cfl5ibP?= =?us-ascii?Q?GjPM1IN3soapVn46r9KioceWMrwQGN7Xv2b/mZp0o2yqbgiLfD6G4u4bbIME?= =?us-ascii?Q?k70+w5mTwitZVg8v+yas1LGSnYPQTXtrnOb5lNgXq9hLCCfx1BlnyGC3nsFn?= =?us-ascii?Q?0LTkod+sxlKoHYBTpo517qNbNzwgXyEKVVvoFeed7F4sfVYhaTAvzazrpFbs?= =?us-ascii?Q?R64vcl0BYbLPVPvdElgnq8mfANruJLzSaOf9WMEeDQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dc78836-cf43-486c-bab5-08da54fffcc0 X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1299.EURP190.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:06:06.1479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6P190MB0263 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:18 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 616DAC43334 for ; Thu, 23 Jun 2022 20:29:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbiFWU3Z (ORCPT ); Thu, 23 Jun 2022 16:29:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbiFWU3T (ORCPT ); Thu, 23 Jun 2022 16:29:19 -0400 Received: from relay.uni-heidelberg.de (relay.uni-heidelberg.de [129.206.100.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4617D54BC0 for ; Thu, 23 Jun 2022 13:29:18 -0700 (PDT) X-IPAS-Result: =?us-ascii?q?A2CyBgCJzLRiffxkzoFagliEfJQPAQEBBoxtA4cciieCB?= =?us-ascii?q?wEBAQEBAQEBAQlCBAEBPQECig8nNgcOAQIEAQEBAQMCAwEBAQEBAQMBAQYBA?= =?us-ascii?q?QEBAQcEFAEBIzwnhXWGQwYnCwFGEFFXGYJ4AgEBgmYBAzCtPjKBAYZZAYE/g?= =?us-ascii?q?WWBPYlWhR+BQIEQgRUzgzWFEYVuBJlDCgMJBAcFRhcSTjEhAkULHAEIBgYHA?= =?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?CAWJAEBDgUDARIZEQ4HFApTJiIVEAYBKxgDBAEDAwIGHgECAyUCGQUBIh0Zm?= =?us-ascii?q?wqBDoFEwmYHg1EQAaA0lmICkgCWcKJthE41gTMLN4FMTSODOFEZD5xyczsCB?= =?us-ascii?q?gsBAQMJjwEBAQ?= IronPort-Data: A9a23:UBm1g6ivUczpmetcNeW3A4yuX1616RAKZh0ujC45NGQN5FlHY01je htvWTvTP6yPMWH1ctp0Pdm+ph4EuJGBn9IxGgM6/3hnQXhjpJueD7x1DG+pYnzIfpOfJK5EA 2fyTvGacajYm1eF/k/F3oDJ9CU6jefSLlbFILas1hpZHWeIcw98z0M58wIFqtQw24LhXVnW4 YmaT/D3YTdJ5RYlagr41Ire8HuDjNyq0N/PlgVjDRzjlAa2e0g9VPrzF4noR5fLatE88tqBe gr25OrRElU1X/saIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0o2HKJ0VKtZt9mGt8h+x sVr6az3cyswPfyWuecUSTYBEz4raMWq+JefSZS+mcmazkmeKj3xxfQrDEw3MYAc8OttDidC+ JT0KhhUNEHF3brohuvjEq82255LwMrDZevzvll7xjHdAO4+TIrrWLnX6ZlF2jZ1hs1PEfvab ccDZnxjYXwsZjUWZApPWcpuzL/Aan/XNC1zpFm1rIUL32no0RIsyv/QK+fvU4nfLSlSth3E+ D6cpjyR7gshHNOFxDWG8lqoh+nSjS38RYQeHaG58fgsh0ecrkQXCRsLRR6gvfC2i0ixc9ZeM FAPvC4vq7UiskCmULHVUUajq37CsR8Ac91ND+k97wLLwa3Riy6dB24ZXntCZcYgucseWzMnz BmKksnvCDgpt6eaIU9x7Z+RpDK2YXFTMGkDIC8JTAcI59Puuo51gh+nostf/LCdltL7CRes8 3ewgDE91u8yjscR+Py74gWS696znaThQgkw7wTRe2uq6AJleYKoD7BED3CGsp6sy67EHzG8U Gg4d9u2sLFSVMnS/MCZaLVTTOnwjxqQGGCE2TZS848dGyOF11PLkWp4wDx/KEptOMsedlcFi 2eN6FoLvPe/0FOAZKN6ZceOoBAw0bTtEN7oTP+8UzajSp14dQvfpWdzY0/V323snEUom6wlN tGXfK5A7Er264w5nFJapM9Ej9fHIxzSI0uIGfgXKDz7iNKjiIa9E+ttDbd3RrlRAFm4iAvU6 c1DEMCB1g9SVubzCgGOr9NNdQhbdSJqXcutwyCySgJlClQ8cI3GI6GPqY7Nh6Q6x8y5a8+Sp iDgBBYGoLYBrSSfdVvWApycVF8fdc0j8y5hZHRE0aeA0XUnfpuipLoZdoU6Z6Im6P0ry/NoU P4feK297gdnFVz6F8AmRcem9uRKKk/07T9iygL/PVDTibY8HFGTkjIlFyOznBQz4t2f5JRv8 uX9iFuzrFhqb10KMfs6ocmHlzuZ1UXxUsoiN6cUCrG/oHnRzbU= IronPort-HdrOrdr: A9a23:wAuv5Kv+9g13he4+zUqQRnNS7skDYdV00zEX/kB9WHVpmwKj+/ xG+85rsSMc5wx+ZJhNo7q90ey7MBDhHP1OkOws1MmZPTUO0VHAROpfBMnZsl/d8kbFmdK1u5 0MT0EHMr3NMWQ= 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; 23 Jun 2022 22:28:02 +0200 Received: from localhost (ip-037-209-006-204.um11.pools.vodafone-ip.de [37.209.6.204]) (Authenticated sender: ln194) by mail01.uni-heidelberg.de (Postfix) with ESMTPSA id 66D69300719FC; Thu, 23 Jun 2022 22:28:01 +0200 (CEST) From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v4 2/3] Staging: rtl8192e: Using kzalloc and delete memset Date: Thu, 23 Jun 2022 22:27:54 +0200 Message-Id: <9727fe31c675f2f3052ca2fa586d137dd856ac91.1655975970.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:18 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 549A1CCA47C for ; Thu, 23 Jun 2022 10:06:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231451AbiFWKGe (ORCPT ); Thu, 23 Jun 2022 06:06:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230150AbiFWKGN (ORCPT ); Thu, 23 Jun 2022 06:06:13 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066039.outbound.protection.outlook.com [40.92.66.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B951849F01 for ; Thu, 23 Jun 2022 03:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XoJmh/DBeQpW2NJUFa5U0Wfk7iCnwRk4vQq4s6qlzMBg2xqbAm+nQFSFKwYNdYVaI59VGbkFe6AU7zUQjuo53gg5vQj3rrw0ar9/fWdlwWUzp7txuP7OPmrRPD87PfRPpdnm/4olj2Ne+X0WIKExNmud9tIYIlVzVjNbzLHuW/HCXpar3A8smiPdQ8j8XU0vzVGalqTm/JVrgmAvBXdEsUXsD3HFDPw9eoqkgW44sf53jvNKb7lqM2pOGK8eB5m8mSqwgsbgO3sYDEsox7lPeAr+YcXPqSzdUqTMkWNIPEfD85tvOqUAAy8IOqD+CW1L6N2VRs0UJcsofyBdSQ93QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v5KgDpnFfukyo2JjpZ39r1xxGFxbCzXHBbU2i6LiqU4=; b=hUOntrYTu4eYtF1pVDVrJDbjvIVPOLOGJcVE/jLLQ7jnjcTmkMOIM6jUuAX47zO9v2mrfTDhTDJnz+CI3h0BdVQ7kMBp7mSoUkD4i0AsnaMFfVqKhlLJKUny89T9+xMvjp1QqQENTvQaPpMA2wqeo7O8QdyNnhiYL3UlWc1LX0MPdPQeuVMfrPbCFlvF4zfjszf1RDnfbEO/Odw5QXkmmyxsJK60j9e1lcoG+krI4JF9Bh9yM0gIPx5KAeM5AK57ikTRnZIH6SbYkua6FGvAku6R3NJfD2c+NkzeXrJjIoX7Y3s0aDdnsnlc6O0UkaEb5492+79gKsbtj3oEYOPpHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v5KgDpnFfukyo2JjpZ39r1xxGFxbCzXHBbU2i6LiqU4=; b=qkc4zzc8mA44Taznfwdd4v1hMxSmYBUSQAmxgbc36fmcFIhxcjDog83bFhbP2jOSwGhgKY2FrRRjpIKhSLhIm7Q16GayC85iMeZd01uxCB4a2ncLHt4Ah+ibxs2Fks6XI6me28qk5v+afItFu2biDJYpppPO6Qu7Evq6q9vtqQ2iTl3wxUXk6dKtAFvwNilHjqa5xrs5bO25NpqRlipsAOgejUqAoEjGyIwG2bvWoAD+vPqr07uGzfIkHPkFw0M1xp2D/nd058EROHnf0811MDfhjgjrnN1fChdcxv81GBjuFmufuK8T52Y35KoNgxddMRxecdFgqWOcYBlU2/RniQ== Received: from AM9P190MB1299.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:267::9) by DB6P190MB0263.EURP190.PROD.OUTLOOK.COM (2603:10a6:6:32::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Thu, 23 Jun 2022 10:06:08 +0000 Received: from AM9P190MB1299.EURP190.PROD.OUTLOOK.COM ([fe80::c0f4:a98e:332a:2397]) by AM9P190MB1299.EURP190.PROD.OUTLOOK.COM ([fe80::c0f4:a98e:332a:2397%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:06:08 +0000 From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v4 2/3] Staging: rtl8192e: Using kzalloc and delete memset Date: Thu, 23 Jun 2022 12:05:56 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-TMN: [h0JSroi5kMgBXKGIiMPF6ENbfrWox0xf] X-ClientProxiedBy: AM6PR10CA0049.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::26) To AM9P190MB1299.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:267::9) X-Microsoft-Original-Message-ID: <9727fe31c675f2f3052ca2fa586d137dd856ac91.1655975970.git.f3sch.git@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a41c7a55-e900-4365-4791-08da54fffdce X-MS-Exchange-SLBlob-MailProps: EpEO96k6WokJw9qhnqKg7+E0MqObEIk6kRyhAIeTFL2dia6wMVe7R8D4IdiONv5HsgFfla73KD2QxZt4bg4ykGMOnx+k5iUuuMJcfr2kgiMDe0Y7RsI5ofBgzUIe5+YecK/LT3YnA4cRWPtlZ0Za74F3US/IpWo+HMqMiHljzouxsCAHsd3ti4ObOPsMHmGd2A6Q5nsP+/jpzXVgioAo+qo1+7APaGLB2QlsFg+47gvY3CtZNY8X81TD66+BKvjAnNhWlg/C5BmNx14bUomRr/5WlhTYJR/JK9LlWox3n7l3BsNr4/filmR5a73XkoWK9k8yHMRD0c5Q6Q6LBVru4uVIQ3Q2YpYm7aBjhK2Tedkbzn0iTf85ppx+TYpE+EjX5cTOFMjYGCDgjN8bNiVRPxTG7sY5CHyY2MGyc4uUCotyw8SqeLOVVmf7OylyeGLFOxBN/1jvCSmn0oa5oGjcDLRV6Dnv6ARaRH88zlNB8GNNYHEf5VBSuYAMiOblwP8lpff2lbOaUd+zhArmCCuodKRYmDT76AeskbX5ZHmLa/9bNq0gOPWeTiijwqByYznmzqlGZN3oonqJCxGuK3Lb0bep30OCnnBDsHnPjDX5/UiNbG6H66L+MrCJlfq8bak9Dfr+5t8WERKKww0HHaDWkR+8XpWzHVsDW0b+c87yD9lsX7Lf6oBKALSqjvAEaVRjMBdmBS8P1wWlzB9dz1vRcvI5b40gfuCr93m/HWg5XboEZEHSjcOjWLVtdTn3Mjw7IyOXQ9DfrbM= X-MS-TrafficTypeDiagnostic: DB6P190MB0263:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2mN0eRHUmoziSqa3iW31TB/iWtQyKtKVzuODxqihv2SljajPAE4MWkWG3OqwckxHeR+cIQLqvaJTiV9zM+NaNYTSBk6bGX7CS6tzxEKJOqHJlpF+fPsBhKccPVt48bdAItfgyJspiPJGCfweWPOmwx5CbzST/woxPvoyDlP/1hSXNPLbhkmBTAaoEsmno/cNQKSgIlUrgQF0HcM+30xFenAeP6qzf9R3TG9oje5SN5fR43SnqnExMG0pcgJFJk+3935mttaTECOS1uBgdHPuyI2ONmNHWDxVYyUxhx6WYsnX6AsY5jPMLiAthWyY+IWQyKOsQeQ3QLb4PVGtXrlSO03XgQu18rFND7utGjk6rSSfoQk9eWC8/4noucwx9jwBSb6dMwCskDPsC10h2i0AvowbwtTYbrjv5rGpTuo4eCp1wBTCq4RzNwm3d3HTTWIf0Rm2vns3CruHK8AgilDh9XUMYeBgCv+E1My4kZwVM3bd7jYvHSOxtaoMcyU240mD4hRmZs54BEux67D8DJqodaQUgqj5PyhgzepvYpokD0+bJI3Uf6kgg/FDY6SPSHEoeJiVrvqMOkjIIhHf0jOrtyaHbd4ICw97eFRRMj5gm3sMe6QTzvfeNdSNM62aGAXJ6No2IkUJCVVB6wdYsGua/g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rFNeuQGFGXBwwothIi0l2pzYYSDbbwj6vrbDQL2Z8yCUhso3WdBC7XMTXEng?= =?us-ascii?Q?Hn6I8a0FA0MaBQ1Pr9mPKbJstp6UbNZCxDL6UH8+7GAZ8tIBELIZafJM1IOK?= =?us-ascii?Q?g3yiuaLya/y1TZUpiGzz9rD3k20wzZ4jVGULntL09SrofYkpVhbqP5iMMj9o?= =?us-ascii?Q?j/e2JhJHr+yZ/Qszqr3UIHnI49HaA2e+7RHzp0nYXiavBWdp44b5xvZg+4DI?= =?us-ascii?Q?BEPcL1POgrTWPs+pytll/DveV2vk4+awt15brz5GLqIIIOOU0SDdv469CIta?= =?us-ascii?Q?E9qfNOx3Y6hnBwVob7zzfkjuMWKjdt8fUIIc9oap5716n/jjekP6A4hqVh/f?= =?us-ascii?Q?xPH4/rYjt+v4RkVJkpvYbixZtlJnfV432NDx/bvg1zO41rCx16kK6Ji1KWfW?= =?us-ascii?Q?Ab3vtzk0mjuKOJWWNGH5BB6Dxs2/iWnFsj/o657j1TfGmCoxtXmTrl3R12dr?= =?us-ascii?Q?+nfSyZ6aux1/4s8sc49asMkaJ1zMy17p9GtARoI6H0ONLKG3f75FoYMYfk2b?= =?us-ascii?Q?4yLzphmDfP32eGdrYZnKuavedsRQFjg+6IF3NFkI4kWsLfy9Mq3GB61pqTDR?= =?us-ascii?Q?moIuDaMCOQIx9Ew3yBZI8cj9c15yR+Ur6fQI7WlMbhSyl9iyScJrYNxe+oPo?= =?us-ascii?Q?qxjgnztkWsYlSQDMJHsAY0JBLJEiMNmGrp0lnv3R4c+kZJnoYkcisH/vjV9g?= =?us-ascii?Q?xz5HGmD6nEe6VoY9ggSr1B/qTilfaGD6UEkcc+6kCUWKd+vPq3dWpbvIhyo/?= =?us-ascii?Q?3/V2/QS9nAlfGjgEEYh8LTRx93OH2C0SbWGEpuJpB9xiFUgb3+ZxA8Gnwod0?= =?us-ascii?Q?VuN2i0ud7fjSca9wDrAOV/Oia1BWZMgft2tMnf8J6rWkAIAFnWXH8NMWc6ew?= =?us-ascii?Q?aA/ASGptGC/dtSShwbITWlrQpZ3rfUz7eE9wAEBU6MtWp5vWJmmMEUb+cnn5?= =?us-ascii?Q?ZSffBEP7u4Sx0FDesWZlvqzQlz89LY6elGgGvMhGVJKspgHgvKAflNhHhMXT?= =?us-ascii?Q?qvsWQZZE9Mnayyp/Pa/gpFsZQIatpwy2LcqB9BHEfthp9XtOtQhQJrMDtwFd?= =?us-ascii?Q?bWLs8I6XVUprTn0ccy8Gp5+fb6kPaKQblyc+YLgM0KOZof30NkLWRpzlNFzw?= =?us-ascii?Q?4RGQuy4AEkPotNU3IbylxFQmrGFF3CakHKzOdxyNumUCCmerueu7DUp4wrvQ?= =?us-ascii?Q?lrDNvOCsTsLAy+gLsihF9AiK9o5hB9ywFkHQCGjlyYB262e4koBINGjjfhOc?= =?us-ascii?Q?kKF13oj/J5yR+3CfJ88meCiOV1fhPaXN1o/TUBmQiw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a41c7a55-e900-4365-4791-08da54fffdce X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1299.EURP190.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:06:07.9300 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6P190MB0263 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:18 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 B9EF2CCA47C for ; Thu, 23 Jun 2022 20:29:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbiFWU3V (ORCPT ); Thu, 23 Jun 2022 16:29:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbiFWU3T (ORCPT ); Thu, 23 Jun 2022 16:29:19 -0400 X-Greylist: delayed 68 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 23 Jun 2022 13:29:18 PDT Received: from relay2.uni-heidelberg.de (relay2.uni-heidelberg.de [129.206.119.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CA6753A7E for ; Thu, 23 Jun 2022 13:29:17 -0700 (PDT) X-IPAS-Result: =?us-ascii?q?A2CxBgBfzLRiffxkzoFaHgEBCxIMggQLhHyUDwEBAQaMb?= =?us-ascii?q?QOHHIonggcBAQEBAQEBAQEJQgQBAT0BAooPJzYHDgECBAEBAQEDAgMBAQEBA?= =?us-ascii?q?QEDAQEGAQEBAQEHBBQBASM8J4V1hkMGJwsBRhBRVxmCeAIBAYJmAQMwrT4yg?= =?us-ascii?q?QGGWQGBP4FlgT2JVoUfgUCBEIEVM4M1hRGFbgSZQwoDCQQHBUYXEk4xIQJFC?= =?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?hsPBA0NCjQgFiQBAQ4FAwESGREOBxQKUyYiFRAGASsYAwQBAwMCBh4BAgMlA?= =?us-ascii?q?hkFASIdGZpqIHsTgUSTeK5uB4NREAGgNJZiApIAlnCibYRONYEzCDqBTE0jg?= =?us-ascii?q?zhRGQ+ccnM7AgYLAQEDCY8BAQE?= IronPort-Data: A9a23:/59NrK0LEDsXVMtbC/bD5Vpxkn2cJEfYwER7XKvMYLTBsI5bp2QEz 2MWDGiGbv2CZWv0c49yYYrn9UkA68PVx99rQVZl3Hw8FHgiRejtXInGdBeuY0t+DSFhoGZPt Zh2hgzodZhsJpPkjk7xdOCn9xGQ7InQLlbGILas1htZGEk1Ek/NtTo5w7Rj2tAy2oDja++wk YqaT/P3aQfNNwFcbzp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonpR5fMebS4K8bhL wr1IBFVyUuCl/slIovNfr8W6STmSJaKVeSFoiI+t6RPHnGuqwRqupvXOsbwZm9Lmgib2PdMw +xRkq6bQCcVDInRv+A0Bkww/yFWZcWq+ZfCKHm76ZXV0kvHNnvhwvljCEs7J4Je9usf7WNmr KZJbmpVMFba37rwmu/hIgVvrp1LwM3DJ4gfvnx41TzDJe06XJyFXqPLoN9V3Ts9gspDB/mYa 8dxhT9HNUmeM0YRYAlNYH44tOj4nmHcUAZakliymLI5/UTh/RAy+be4ZbI5ffTRGZsJxB/Az o7cxEz2GBwVN9y3zTuD72KigfLJkSrnWYUUUrqi+ZZChFyV23xWEwEfWlq9rtG9i1WiQJRbK koJ6mwioLZa3ELwVdL9GRK5vFaDowIYXN1TVeY97WmlzqvS/hbcBWUeSDNFQMIpudVwRjEw0 FKN2dTzClRSXKa9THuc8u/N6y60OG0VIG4OaCsOQBEKpdXuyG0usv7RZspyLbzyqeD+IC3X8 RuDjBQMo6g0iedegs1X4mv7qz6ro5HISCs86QPWQn+p42tFiGiNOtPABb/zsKcoEWqJcrWSl CRVx5HGs4jiGbndynzVGY3hCZn0v67tDdHKvbJ4N7UMn9hH016ufIxd5DtzPkgB3i0sJ26wO he7Ve95zpZfMX3vUgSjeZ6tBsEgwLLvfekJu9jRZ9tKOsE3aQmGuSFjZEKd22rgikdqnaxX1 XannSSEUyZy5UdPlWTeqwIhPVkDnXxWKYT7GcmT8vhf+eDCDEN5sJ9cWLd0Usg37bmfvCLe+ MtFOs2Bxn13CbOjPHGPoNZJfAhRdhDX4KwaTeQJLIZvxSI4Rgkc5wP5nutJl3FNxfwEy7mRo BlRpGcBkAah2RUr1jlmmlg4NO2zB88nxZ7KFSYhOUm11jA+Z4ex4b0EdocmNb8q6PNk1/0cc hX2U5roPxi7cRyZoG51Rcem8+RfmOGD31/m09yNPGNiJfaNhmXhprfZQ+cY3HhRX3vv6JVmy 1BivyuCKac+q81ZJJ6+QJqSI5mZ5xDxRMoas5P0H+Ru IronPort-HdrOrdr: A9a23:o7K7RaO1PIHICsBcTsyjsMiBIKoaSvp037BL7TEXdfUxSKalfq +V7ZcmPHPP6Ar5O0tApTnjAtjjfZq0z/ccirX5Vo3SOTUO1lHYSL2KLrGP/9QjIUDDHyJmup uIupIRNOHN 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; 23 Jun 2022 22:28:02 +0200 Received: from localhost (ip-037-209-006-204.um11.pools.vodafone-ip.de [37.209.6.204]) (Authenticated sender: ln194) by mail01.uni-heidelberg.de (Postfix) with ESMTPSA id E92D7300719FC; Thu, 23 Jun 2022 22:28: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 v4 3/3] Staging: rtl8192e: Cleaning up error handling Date: Thu, 23 Jun 2022 22:27:55 +0200 Message-Id: <13b32131cd00a1f0b8793657a24ada71240a8350.1655975970.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 From nobody Mon Apr 20 01:10:18 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 31407C433EF for ; Thu, 23 Jun 2022 10:06:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231472AbiFWKGh (ORCPT ); Thu, 23 Jun 2022 06:06:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbiFWKGN (ORCPT ); Thu, 23 Jun 2022 06:06:13 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2019.outbound.protection.outlook.com [40.92.89.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 946A449F07 for ; Thu, 23 Jun 2022 03:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hvHNc5JTJkZeYZy8ygCL5IrzrLxb/0wRMQ21D5agT3Yho2y0jRtB1KvcKAU3a0B7b4iqA8vT9umHPhpN2qJcWtqteFyMpj7hjjXW7bSDIAKbYOJH1mT3hhSwt377kiAFIRUjXVPyXu+fEQ1KAx0hqFUZioHxz0QK+FghCwkQX9IHAl0ersliw0IqBqwDHRsz8jbecp7zmTJ+8IXsZG03b/ZVyGPgJkoyNNx5vuh1/Nlm3/EIDUG+9OEDglWuIcOnrwv/IDh0HuBiQ1L3WU0c6RfSw8lFy1L1VxB1QZS/U1lkqdYJP5KUl70Og2EU75MBw1UhRRH1rv9D2fEnJhMXvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mzKwUPPwRsT8aFCwmg3dhf6ejMVeAjjL62OmP2YB0Pg=; b=YeyweDoltIpGyjkJ+iJCi5YGAtX8udEhGcEpsQwfV/lLiwWfBRGRgJdktBX2Csbyj5yjQOdljD6niZW+1YDGjj5QNEWZDU8xbvNf1dxQ5G2BjTfiziOyEoaBElkDkZwLwntT281wjR72M276jt7wG0ZR7Dj0quZgUB8EARQKpy/OySiL96+djBwg++Dqww+IkMXtpsdzU1Th1UEA1B/d9tt2sSOaK13nl7BWIt6URdhivfDgI5qVNP96CSGR+JI2SexKb5uEmd0bOWUwxckVwpiT7e/xEkzVdFGUhl3Pf2lP7V5bUyvdx4h7EJNasBvRhX+TvhwkhsOfUC+bGJygNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mzKwUPPwRsT8aFCwmg3dhf6ejMVeAjjL62OmP2YB0Pg=; b=uTAUnjvQz+HbCRTG+h6wjYwPvGeJvEuwREiB4hVz3A83XjhZ601iK54Fur3NKLL48lDl7UlXj8KW5Y3WQAN3afHKXSFuzwUf9QiceT7OQmsZ0nBAnRl3IZc5UNvlYmoPetaYy9lARASTjWpPHTwijGwbe+exV0mY7uIqPJTjS/G9EmIezPWBenPDZd9oNY20iq78vqerSBUCYQO//3wlPgJycoYVzNWZ6P01BfUX9dxcfixMD7GwPIbOhYMsvSaiRSmyzNOKM7aWUm8KcRJYUWIEm9UMS9LKXUR2j9TSYbRSLNlMJ9KI9NHxqD8/i86pIhjG0GpCvfuJTBlbD5iPrw== Received: from AM9P190MB1299.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:267::9) by VE1P190MB0879.EURP190.PROD.OUTLOOK.COM (2603:10a6:800:1ab::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Thu, 23 Jun 2022 10:06:09 +0000 Received: from AM9P190MB1299.EURP190.PROD.OUTLOOK.COM ([fe80::c0f4:a98e:332a:2397]) by AM9P190MB1299.EURP190.PROD.OUTLOOK.COM ([fe80::c0f4:a98e:332a:2397%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:06:09 +0000 From: Felix Schlepper To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Felix Schlepper Subject: [PATCH v4 3/3] Staging: rtl8192e: Cleaning up error handling Date: Thu, 23 Jun 2022 12:05:57 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-TMN: [Oll5dDN9NavCiWA9heI08KKX2XMkeQ8l] X-ClientProxiedBy: AM5PR0602CA0001.eurprd06.prod.outlook.com (2603:10a6:203:a3::11) To AM9P190MB1299.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:267::9) X-Microsoft-Original-Message-ID: <13b32131cd00a1f0b8793657a24ada71240a8350.1655975970.git.f3sch.git@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe7c359a-e676-40b3-84ba-08da54fffecd X-MS-Exchange-SLBlob-MailProps: EpEO96k6WokJw9qhnqKg7+E0MqObEIk6YFAzE+fssm8VyXUMoTZexZEO34hAXaBHrd39nltYwiR9tdX0zzgQY7bBeMpdWKvrg799CBlN7Sh3ig0g3VGQow83+nyS5nmf6aRz2QZlyFKSi9HcJp/aCu7jkrFl1oo3zL4WeN8Q4NftgXri0Cr34Qzzv+J6LxgwZVZaG03qZ/8zUH1ElrBc3Q+f6Rpb7Go0lPd4Ba94hfY7Zra5GEkEOzJp3tuakn7IXt7lsCJ9/pP2MSFU6MiigOptdaxTocjBeSQzIgSoRME/zOcSOyMTeLvciXmaYHxhFMEvWjGqhdG2/57X9M4cD3/h/NouW2XD+nqdoc+3XESW8oIq/NxnPNyPIJ8IfF0fCspnqyyLoIDnz1VkjFHsAivAuteJQozlveNWbIrvTRO7l5r+dFj7NWISVTDOkd8sKYcAyHBPlXdMX/4oNGEg4/cbXI7tWF6r61G5rlSw/TLWW8tXRxlJlVtP/QHJC8i266aSixjVXZE6XL03PmI1UB3LWhwAIJG9jhALFBsI5ljFVO4JDtNCEfsMIiZlJiYLFfXPSKQXezQeTNd/l1ZH3ITBGvi2akVREHN5su9HHyLA5pp3T7dDE3SQmuwxbSxCvTfyjS3/ZvCRy1VevgFyhyza1zioBkjzK/FnmrwzJIRKgfinnB79ajPtjaCk6AcaGxUnPK9CZF0rpGzlFe3yhV6YGjmfNrpws8jE56C4ItZTY398wMy6sj77zurniZskZfeDQPNO5UY= X-MS-TrafficTypeDiagnostic: VE1P190MB0879:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z+IoFAYY1JpD2SCN7egznG38Y2S2deLnu+phtEQwVBEdk15wzLt+Tob2/x1WjSRK9toemvduPTcDtdBQQBGuJcP7iRJ3u2oESPKCvEQ5bNx7Ig8zjGzgdkJGlEd/OKR7ercMqmEsD77a6yW9aOjDQ4FEfuQ5Y09WJVU7c3NjmYYJFXqathuMoH3TNN7cjbbQFJ93ozxCd/yhlLl9JSnRjEKpWwn7IC52MdPq6vfgeMQ5NUY0ryHcYDv5YYnbr7ChpELTVFadXNGQ/GLSGaa9jpT5uIv1Y8btkREpuXQfpg1Tdkj6gaEfNPKlnac1GRKjwHx5t7f79BVSnuHRsEmMUfOpfLIFBhqPKbfJQrj5D5cyMajoYkuPlxerjVAZhj0HU6MH2SAJh7Tt5rNe5NzYK/D/Zd6CJLnvE2vdvooYn3q4EUMjSSq97iiSONLviaszyzSFAJm+cltT9MAxWvsZflSLcoq81OG8i/e+3IO5lzRDb4rD39DTHn53M5YOWVA30y5frJz/sSBJxrD/FMgTQwhzoLkQYxz7Qk4beyCWMSSUN/Kl4THvA6ZlTev9BnojUDuRLIp6NS2R3xtZwwKbfl8JZgY47WlOLw3DYlkJrXyucuuV99BYBUrA2pUMuHgCF2CeFLZ27kughsUBvlHvlg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ALi91tNgaC44wobwUtwdaHIUC9Zi8uah8IuJSJIeT3FAYkl9US9LvlW5owhk?= =?us-ascii?Q?jkVLK2GhWpFYaVEUROreui/7vkYG/TNxtUO0Z2lMHThvyP2jR57H5sGMRKI8?= =?us-ascii?Q?qKLYBhYQq0PtB+M3Dxj/kYIJDzM8NBYBLGL+S5LdEMWNFXAnt0nHNKTAz9fw?= =?us-ascii?Q?Q4gopNMn0DlBok3aotdfyKd7Wex6JWyauyF8atBEzyygxXYjbLd9NwAHkhNS?= =?us-ascii?Q?iSZGA5WZZPQTOF2Q1PpuSAeCkoUQcY6bI0K1voE1vNzs64EIDmurKlqxvbeu?= =?us-ascii?Q?jzn75j99kMi6Lj3maJK3HcuirvQPdKMDhuWancnfnNatyGmWONRfWwdJNazr?= =?us-ascii?Q?N3egBW4UPqtuUzGnIxZHBqiCYtQd/mwWo1jZSpKc++Scwc7ffCYq/CsLZkqR?= =?us-ascii?Q?7VueuXxs3qZBXfMiEPVu55BQeFlJHlZofCEAH+1F4huufSAEwcThrs4F4ZpA?= =?us-ascii?Q?9hJBLsgBjHyPta1mJDQlTSytS3+XERAD1koOHRi4o1GUWUFOFc/J+F4Fcm15?= =?us-ascii?Q?8DetFmBna4fV559gtysqPqV2TxdiAIDEeLTCtsh2AbAGFPuVBPT7xv4BeLAg?= =?us-ascii?Q?qVLlTvt2vI6cRHgoNEibCd2voaOqGNdIUO5vdFqi5frqPh6/KH8nxT6QyqYR?= =?us-ascii?Q?RTwg9T7FFYj6ol2XFWGZDHIvDJGeN/KinASYE1Io5syPPb8LXGMHeJZ8j49j?= =?us-ascii?Q?8z5ujiOEycy3q0evpBMO7Ed9w+L91WkFxePu0TurM0IYO3AusKKHSCbjPzAb?= =?us-ascii?Q?ush99r0Kc5H5JCNEGktmtWO682k50mKkIJyngfF6k6n9UY7zjhzRfEx1ypKy?= =?us-ascii?Q?zV84e5gOUsP0zjP/Ygu98N/1PrxwG3Jo8AfTzNiM1Kb84U6d6vcuR3FLY3wd?= =?us-ascii?Q?6YbknUoMCFNYKuNZJKf1FpPDqyVQsanqorNeXeak9qbh2fg9t/Ks12DkixTi?= =?us-ascii?Q?lVk3oDYmkspB+ZoADYammA64Cskgv6hiFlQxXYrgPNhDRUd1gOhQHNNhbwcw?= =?us-ascii?Q?BlTgSCrS+4UMzI1nzT0PG90lZG5t+1n3yqzmL4H484MfuK4i+t3kOty8gImY?= =?us-ascii?Q?q4Q6dPrmxVjy6Syb+84VaDRh5b1u9uWVN61owPfSvSQp3atcnqQbKSyF8ijA?= =?us-ascii?Q?tQkciSA101U7SMxOcA/YegW0dE34KKeizXlea9T8ySl+unrAuf1CVDI4Eyzx?= =?us-ascii?Q?V0DuyxfOyD/7BbREhngESOEyEFXSkVe4TZgiyLwloQ/ne/opHmcepPLBbix9?= =?us-ascii?Q?j6Tf8aqh0rV9v96d51Fmiihia/R5ZKdy2S8WQYnJCQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe7c359a-e676-40b3-84ba-08da54fffecd X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1299.EURP190.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:06:09.5871 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1P190MB0879 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