From patchwork Thu Jul 19 16:23:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vakul Garg X-Patchwork-Id: 946218 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="JImi/N91"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41WWP21hMKz9s1R for ; Thu, 19 Jul 2018 21:04:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730273AbeGSLq6 (ORCPT ); Thu, 19 Jul 2018 07:46:58 -0400 Received: from mail-eopbgr50040.outbound.protection.outlook.com ([40.107.5.40]:60000 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727367AbeGSLq6 (ORCPT ); Thu, 19 Jul 2018 07:46:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tWsBNG9XJ1Sfu5Y1Rz1YxJsNpZqoFshaSSBgoVxugcU=; b=JImi/N91XZxI5YAcivz6DpmaIZktyV4ucJQsJSGzaoo2wh2R2tKeLwdvEYGI7/7U+xnLVG7DBA+O56LTml2o8LwVRysGsmKDNxCFO+LvqG3oRunpB7RyJFZORF/qCXlHrriEQK4+uEVvOhT1nS2+ER6rVBhLab6HQXtpXG5ZTB8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vakul.garg@nxp.com; Received: from lti.ap.freescale.net (14.142.187.166) by DB7PR04MB4251.eurprd04.prod.outlook.com (2603:10a6:5:27::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.20; Thu, 19 Jul 2018 11:04:13 +0000 From: Vakul Garg To: netdev@vger.kernel.org Cc: borisp@mellanox.com, aviadye@mellanox.com, davejwatson@fb.com, davem@davemloft.net, Vakul Garg Subject: [net-next v5 3/3] net/tls: Remove redundant array allocation. Date: Thu, 19 Jul 2018 21:53:44 +0530 Message-Id: <20180719162344.26968-4-vakul.garg@nxp.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180719162344.26968-1-vakul.garg@nxp.com> References: <20180719162344.26968-1-vakul.garg@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0040.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::26) To DB7PR04MB4251.eurprd04.prod.outlook.com (2603:10a6:5:27::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac5d907a-ec33-4ca3-1641-08d5ed675d6e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4251; X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4251; 3:ItPmIMoxC0o95/8OwDtz/oaEQyibI08bETCyqzx8QhuJxs0dItXKnA8hUQKQrOVUOYhnwKUpDtLG+pB7jbNQmBSLXwL9Yo6GPLmhYxFLQic38Pq1Z7gygC9/DDo/MrpK/AiRKVhrzQ94fFKBkMdg93AIV/7I7s4HClZ+U8uWHrRdLOjuqhlzx+sUbbJr16vAIlzwh1+b3oRUeXkMq9hSlJpIPbzCO0UxIxwzG5Ad5a8CV72DMHc0x4oYUN9/8Qh3; 25:nJVXjUFljs7HX2FuDNQ5fMz1A8DKV4FQNjHrXVlCfrJc0LixDpy6LrfRzrSXpo9i+jgjoI9INh7eWNj6R4YnYpMymetyQSGTaQhoZK1TxK2NShGw8IzBLglc0YaEgBL/Q0oVoPpBZ5iu1JhrZM9IPBX7ECZ1wfg9uYneI3y6gxELi+ykbSeEpRhRrzSSxH+cPxl+t4JrUCV/Ccd0iwtmbh91H0YHkmyniHWc4jz02shGliD+jp/vxgE/FuwZNZeYka3UJQ9UhuuYvukAdPh3mDwrPgqnI6DKGNC4M8jCy4EZdSQM0lrjmhfrw/a3vGe4I2RsJhHVIKx91iPFuaeCRA==; 31:OIA4GxE/0uw1MyQbgYWUVgvAi2U7fYhkr39P3sQrEad21wv/xBFZAxMJjEkiWgFLu5JTWih4Xl6r7jDBqYXniCF5g7WPI1p77JC2qNpB6mDOHeMGYUKr8MhLlE6qMY4BGexKSuW+UUrT+cDB1bUEUY1365SAfdrY6R+lAHGDpzVS/f9m+sX/2YSUjEavaRUEJutbu0KD+dkxVo7tfIqEDJ+kg28El5/Rq7S4No04PKM= X-MS-TrafficTypeDiagnostic: DB7PR04MB4251: X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4251; 20:EGvV16ItH+h4NpRjDaaSRXppVni2fH10dqzVQDzyiD2irUq8kjVhxhqjlCp6NbCI+aDb+2LBRCqYLw6NKkAQtFd2IlSVJS7HJnMKaQ5236eyI7ZOx2CNDtPlkcy7JvtUxjt5yJRvgMyFww6J4qBRqYS36+dff4VMbRDlmPBcrYCSbgfRWGSBQVq2ej7cXDTS/HDtPUrhqBYhUewdaXmTd545+ykieFy3te9KS1FHoeBQ7CX1O/5yyggRfVPaOhHn1KXiQvpigTatZaMU79m+XUdijet30/J7duF+TyZA2NgYKRp41to+XZZEgmd+P14LpuvR47wRFJB92fV3oprF4m0fwOz9tAmxnzMcOlRblVaEaIsB6Za5Z3cJ5GmXtJUmh7bsV2q8WXJcA8sGUB+rVj2u5bTQThfpIhBMvwefrlYwBM7oMfb9YSym/ifmgd/6hlLY9dJFYoCOnNyyCzqkNIclZM7fFwTu9SVw+ul1M1ZSk4zNKq32a7oFfUFvg1rx; 4:H+tqvhKXPl8Ry2hCksURsAxho97AZZr7vnyWyn1AdFbqXYAq5QljRv//pnuumdt7UTdKjwqOesHeS8Adlwb5ZLRpzf9EZ3hJLhbSY3eRhW6HA+DXijsdtlPD7aoqtypnOrkCmMEqeE5/8MUTMmvuWAfReQdI+eD/U9JIe6pfb5KkUv7z2TBP2xEmNnB+b4G3DviNTlt3U+562Lqh6XEsC5yrwLGzj/qTWcdlgPbbRVmgi6TBlEawzE5fyK/Q7GLWW7UKp59i1HuEoTDvCqzeBXJghj8HvQZaMgnCkp7n+3VfsWXCv3w4C0mjp9hz3txY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB7PR04MB4251; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4251; X-Forefront-PRVS: 0738AF4208 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(366004)(136003)(346002)(199004)(189003)(5660300001)(446003)(478600001)(5009440100003)(6666003)(105586002)(6486002)(50466002)(106356001)(6512007)(6116002)(1076002)(6916009)(3846002)(2361001)(16526019)(2906002)(53936002)(48376002)(25786009)(51416003)(52116002)(81166006)(6506007)(97736004)(16586007)(305945005)(76176011)(476003)(386003)(81156014)(956004)(8676002)(486006)(66066001)(2616005)(50226002)(7736002)(47776003)(575784001)(44832011)(68736007)(316002)(186003)(86362001)(4326008)(8936002)(26005)(2351001)(11346002)(36756003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4251; H:lti.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4251; 23:0U24rQn3vMfjLPIQ335Q5lqNy5hLuHNo0YE+lokhAVejuLwv9pyums072gN2JpIplZPmZG8pMOybAIK9M7ip0u+hFU29PwzdXNFjau7jfiJZmDASwppxPTOA8800FcMtUiu6DwyVWMniTxSnHPZdYugcUMopp3lqDOHVw0KrtNug+riy9i1YaP++UcwtWSQNfvTV0keDqx3MFe6Ch2V5+/uJs1WAHRzO2yQYng+4nIIiHLh5/IqHovtGLNgmPHdWO8rQ044boaFFfdJPWR8ZtUEUovxRMyVZH4b1HBga9kS/69wrqR82sf8i7zBZzHMXaXGMLxaWZXTWGHFBMnEMfZ9CDSARXxCpET14qikojGOIvSAil0Ag1HdRvTdSOwoanwjG4uQq49B3EPLW1uSoIYIrozDt+vlwQkxGmUfNdAyh/TsFg8VzO6G5tLmMOX9g0SOIfJQQiLMfWasnyZo0i5ogMQka5EAdLLf14/PnNiDnBdTjzXtGorUXfSGPh5HfGZQA7VrK00OhJFx33IOuYIT/jsoB03I0zzW2WuqpwguvgEtGRHzEh+noKay1aNZuSJmvUIa4wMmL1s8HjoQ1fU0IFv0v9JL9YhxVtmaFlmCBdiVNCw/vfbwuX1NbYZucS9amQ2P5hO+3KBhZ5Z72G+FwRkoC0Ok0vVfnLRu/2oZ1JWPu0DXtn9qZo5lOazjhx6nxYwVEyxg9GGu8vtBvafZskXBNRrVNM9CqONeIs4+TCvztM7X47e2L+Lpfk6lBdvkZOi9UarTFuaezdyKX/AqJjZVKULCYt/cjRQo/+9u51OWrrmalVnvsyBbq1aqmu91RMvWx5AXv3pEz9+8+7WC6GHYvvlyfTiPwnkwGpp4n76lqgNVUzdRZ+dp3olgrwSnryRvlFSpPLNW6hsoF3VoiZSCG7fnvVSy06rHztG8Xva/eWHTdfPS8mwpZ8y/PJaGhVWlfqPyxQGnGDCGx7wH6MrRwFuNy8p4qgv/AjM8iekia6IUU4HhrEY0PjT9uW+afiN7tWkhHKrI3AtXjJO7lCC3Zy8jFq+7v6qrryaltONrEincnwBfIJq+LUkVRfzXK/eU+liJo0jRLw8qZcPVoGab0c405m1nMF+GR2DXNQJb1Q/wkl715HXG184spk9AzSSoT4b+d2uYf7iHWKaD/t4mfUIusXNimhQCuop1aaOL3F1/OBiBwpy4S9+z4SoVfgXPpmRhHCg1VYzef9l19yiPllcnyM5icokOx1+xoKSSXJcfRS2f6p1IHYcboLXt+fvgcmZIBDlPfZX+0F3xVys/RkmWQzhNxiEaMcTPWQI3O0cXlXu/CmbAwvUJc X-Microsoft-Antispam-Message-Info: cuxWqcJzVd4tth+R7YNLgQxgDsJDq34ZxmSaTJM2UI0MjzkI1wo+YnaXz30AIILM3zhAaob75VN9/7MtrYXpHj18VXT+y5MT+mA3IYluZoeygZG8yJxyzKvDL4J7po2PUqMKitu8DfgY9qZRI30Rr0Ku+1/hwrvVqa4lKIeB0W7vsQz9Fe7L8tQbFA6jKmOgQRvi8oTFKoUMK82xax9Fi4hTG/UVgXgI882jBERQrMTHNM8nHRH8VBN6ie64UqNiMnhLDduzQcWirhi2CNJVSc6aFHg9VVmVWnIHmxH+y87Dx6GPSpPfLO0ZDgjDvVkuIxaaR9NLP5epTAIPkfvAdG0PjwwXqqpKSNyT+72ZLS0= X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4251; 6:Fu8ECuNz2X3vvlUhfQ50ySPS7zTDZW6WC0n6Khz40h/n/UA5P7gFatW0VqW267/m6yIY7tX5sTeBTjN2HwTrB3JFzH6jk4BonAiLvnMnk/+Sx5fvqWxazEAqlmCW5ci+U1pL2rcDfAObQr0uhnLMIN9wJUrM5Jtv76jaIRrtyJL03wYvP0yx6PoLdaJV/I0E8qhTFzc2miNpe7X8jWNU7T2hqVyV0mkaaZHprYvw87D4WiK+3CsMCmLGrjEMFdXyusk3plQpxns5z0edmyTurtktVbYuLoNUZMd72IkBdXlRvnhnnECf2w8bo69YVzJxH2scLUtmgEYJ6lTR+y0nm9Px36AMlUXZ1tY0VDXpbyVQWo0NJp6j0yuzsdk+5fQNZd+QDQ9zwZf0SXmFzdFJ4Ojp3OVOb/zkrvK23JbmSo/HenDsUatGnlHxXw85BAJh02AKVFvzP4OY/9yCnQpKNQ==; 5:oyAGuEPDDtgfopoBSIUe4IE/BTvw8/NemNqUv+TFtkXnkAhKTqammCTb8Rx5mqu4ZP8mA1Mul9MbJ90IvOrw6oPWGh8DLnmyJwShjdjtHXkhD7AoojDZbjfwzhE52cJIw9hE+Ef2+8AVljuEyk+cdlltAughFpu24jR1DfGKfJw=; 24:aU447yZz6fgnRTNruWQHBtvpPp9eQAHFaguRkTESlwg6bVvARPoYWtyjbuA8/fHX1mGeBx/+FY0Eqs5/ASP+5WwBhT1z0j9+q3PB6dmnogI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4251; 7:QJIP+HjajWzbCmc4F2ApM67Ai2bUdiDo8aBsRXB05IPecUS996j8gCiW1Aoo2F019+K0Dte48a0TR6LGjLhmnmV8iBHtpAvKEAAFlLIAUeG0edzwTa1F8JGZMGpPxehwZaMKjRZYdLazWMaUMQdW8J2ZtpxYFi/0hTaNbsCrXpbQ6VLLsSFoZqb8VVHpGeNmrSR2QR9PDqx9LERpynVYa0KAPOYJJC0MAnUs2BK5qS2L3ZpRKtpkeV1gGxa5CqQz X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 11:04:13.5046 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac5d907a-ec33-4ca3-1641-08d5ed675d6e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4251 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In function decrypt_skb(), array allocation in case when sgout is NULL is unnecessary. Instead, local variable sgin_arr[] can be used. Signed-off-by: Vakul Garg --- net/tls/tls_sw.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index e15ace0ebd79..1aa2d46713d7 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -704,7 +704,6 @@ int decrypt_skb(struct sock *sk, struct sk_buff *skb, memcpy(iv, tls_ctx->rx.iv, TLS_CIPHER_AES_GCM_128_SALT_SIZE); if (!sgout) { nsg = skb_cow_data(skb, 0, &unused) + 1; - sgin = kmalloc_array(nsg, sizeof(*sgin), sk->sk_allocation); sgout = sgin; } @@ -725,9 +724,6 @@ int decrypt_skb(struct sock *sk, struct sk_buff *skb, rxm->full_len - tls_ctx->rx.overhead_size, skb, sk->sk_allocation); - if (sgin != &sgin_arr[0]) - kfree(sgin); - return ret; }