Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3503622iob; Tue, 17 May 2022 01:09:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLoX36oR9W07Tt14o9BWpinbOit34ZVgU6pTCVR0bvSThijm1l3VnLE79YJ+OOCIYyEYbZ X-Received: by 2002:a05:6a00:23c6:b0:50f:f570:7ea7 with SMTP id g6-20020a056a0023c600b0050ff5707ea7mr21488711pfc.76.1652774986599; Tue, 17 May 2022 01:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652774986; cv=none; d=google.com; s=arc-20160816; b=ZEEklQBmhhb0gOJyim56P7v3M1C/rt75XW8n5B6XtbaBxrfJO/ILtviP91+aHThpwV EgnnjbZDQszf76vJ/BwyT+p7xYtwMkfhSAK7SrI8OqGQl2ZXzfA8ETIXUqURtyROn3o+ YWC7uV6bTw5YXDMeTTY78dJ3Fwlg7jSLFHl7/FAbZVvix3g1NTENBrAJuaPzwce+nzXZ Zz6GG3b/JPrrRUSYhYHMHEYSkA5zKmRYBW4/U1xA55DuslE8XgsqJNXRpDeu+TSmrFpr PtBmKuLjT6Q+QqqZf3kh8mJylTN/xciwTM5jFpiZLnlmL9wx5XwBshBQeV2J0vApWG5Q ZwLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=hhjyB3ZswCnZzyelVA86Kt/El8fAC1DqxlWCArH9fQE=; b=JivhFfjeIe6Hxqfy7PCafB7Gbicwv2qWstjek9br5DDJx7z2ewbcWA1WIofAmH4fFQ Wp1L/P29ElL4ttA+qNzh5CPS30feehsbzcwYfe8Cm6ipEshgQJYxqSrKyzqZynHvAf8D SKyp1bwT6QgEg7HAVQ6EwsKoKVemdKQc5fn9sBzaOX875vXjS2Gtl5FC4WDu38J/xhIT fIw4auXcAc6xZIg+kn36UduMXuPBgntV7GoFWlkZ+5g1SxvgxEq8SeH94nJr6iScuCfy 1bQ261pOgp2+APhw+ZJksx+v/KpJU35LCbc6ljND5KOgpWuJm7Qnhrzw6paEja8ivz+8 I15g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d7-20020a631d07000000b003f24384bf84si11591446pgd.485.2022.05.17.01.09.24; Tue, 17 May 2022 01:09:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233841AbiEQIHO (ORCPT + 99 others); Tue, 17 May 2022 04:07:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242347AbiEQIHO (ORCPT ); Tue, 17 May 2022 04:07:14 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E08953B549; Tue, 17 May 2022 01:07:12 -0700 (PDT) Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4L2TFq0jT7zbbxh; Tue, 17 May 2022 16:05:51 +0800 (CST) Received: from huawei.com (10.67.175.31) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 17 May 2022 16:07:11 +0800 From: GUO Zihua To: CC: , , , , , Subject: [PATCH] crypto: Use struct_size() helper in kmalloc() Date: Tue, 17 May 2022 16:05:32 +0800 Message-ID: <20220517080532.31015-1-guozihua@huawei.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.175.31] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500024.china.huawei.com (7.185.36.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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: X-Mailing-List: linux-crypto@vger.kernel.org Make use of struct_size() heler for structures containing flexible array member instead of sizeof() which prevents potential issues as well as addressing the following sparse warning: crypto/asymmetric_keys/asymmetric_type.c:155:23: warning: using sizeof on a flexible structure crypto/asymmetric_keys/asymmetric_type.c:247:28: warning: using sizeof on a flexible structure Reference: https://github.com/KSPP/linux/issues/174 Signed-off-by: GUO Zihua --- crypto/asymmetric_keys/asymmetric_type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c index 41a2f0eb4ce4..96a99a91bf17 100644 --- a/crypto/asymmetric_keys/asymmetric_type.c +++ b/crypto/asymmetric_keys/asymmetric_type.c @@ -152,7 +152,7 @@ struct asymmetric_key_id *asymmetric_key_generate_id(const void *val_1, { struct asymmetric_key_id *kid; - kid = kmalloc(sizeof(struct asymmetric_key_id) + len_1 + len_2, + kid = kmalloc(struct_size(kid, data, len_1 + len_2), GFP_KERNEL); if (!kid) return ERR_PTR(-ENOMEM); @@ -244,7 +244,7 @@ struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id) if (asciihexlen & 1) return ERR_PTR(-EINVAL); - match_id = kmalloc(sizeof(struct asymmetric_key_id) + asciihexlen / 2, + match_id = kmalloc(struct_size(match_id, data, asciihexlen / 2), GFP_KERNEL); if (!match_id) return ERR_PTR(-ENOMEM); -- 2.36.0