From patchwork Mon Jan 1 17:00:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 184177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4058915dyb; Mon, 1 Jan 2024 09:01:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEx9lF+4cijhkusEv36/8i6lvp0/TN7lw1J9vq+DwDFbm1T9So6iHJhBTAb+JQvBr8zA9nm X-Received: by 2002:a17:902:b944:b0:1d4:b50d:dba9 with SMTP id h4-20020a170902b94400b001d4b50ddba9mr2689595pls.71.1704128483499; Mon, 01 Jan 2024 09:01:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704128483; cv=none; d=google.com; s=arc-20160816; b=q6FHwTRJkBN5z6oeMY+e8174IZsrm8FX+MNJ5NkeaVlAPrQJrn6aeuZIaTb1obuIvG xfWfNeOlDqxY/41g3AKHK6LngprUu9u8nMKA5kXXB1hopWxwSQIMSz7jf/GAcxeElm50 D2ssItdcAozB5r7c4OP/u+C58AQiN2UItPcHPs9U1e5af5npmnOoWWdx9GlDpwA4cE93 jgTl5PTUKmoYq9/CO0j0MwT+OWOzylYHb9Ka791rYPdqI7MRCXwH5Cliv6yITpb6yGOD UjBoX0ddrRpEnCYSDtqTZLhKe8VNBJcRdWCHzh9W6FuJxg+K4ZRBuhSGc6Lew2FM/B6q 7THg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:subject:from:cc :content-language:to:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=leUS5jr1DOG0mnUcE4w425fL59GroYCHenwwsxhCC80=; fh=Sm0Gl5kxo0uwvKz5ERNEIlGlqDy4P2Lz+YsS0AyiSes=; b=Mcyu4q7IEiY8XZF8HXmxXlJ5PMI/sWs9vyh+nIKXuAU5pbtJxqG/P3LbSbuqKzglp6 86iWiwW914Z7t5CZ0dOW0jURwIDPRQbC0XcpjtLPbSPzu+sBzNTwu+Vvn555bY+n1cqS XlgQixTkIXreeoivXG7q95xMO4eKnLRbp2EJo/C/tB1FLuz0beQ6oppe5hXGVdFRXqea c+B3dTq/MMf/PsUOVKbbauOMiUUPNSM35C/vn2S9B185HKA685IzwaqJsMnfnsVcaKeT NfmuVoT48L/9wnznNyNewBDIPEMVN4nhU2WqLuwlM7mwvQDluZtNuJQxxFnfXPpinp7N c/Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b="j48D/gbS"; spf=pass (google.com: domain of linux-kernel+bounces-13911-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13911-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id ix22-20020a170902f81600b001d0176127a9si18477725plb.307.2024.01.01.09.01.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 09:01:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13911-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b="j48D/gbS"; spf=pass (google.com: domain of linux-kernel+bounces-13911-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13911-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id F30ADB214F1 for ; Mon, 1 Jan 2024 17:01:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EFE768F62; Mon, 1 Jan 2024 17:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=web.de header.i=markus.elfring@web.de header.b="j48D/gbS" X-Original-To: linux-kernel@vger.kernel.org Received: from mout.web.de (mout.web.de [212.227.17.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 097C863A7; Mon, 1 Jan 2024 17:00:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1704128420; x=1704733220; i=markus.elfring@web.de; bh=jt0jjg+eimru4BQyDAlCdV4s+tkByojsMTZSQQ+umHc=; h=X-UI-Sender-Class:Date:To:Cc:From:Subject; b=j48D/gbSB+TQnLiZIq/v7o2ONanye319FJHEw05/LjFntPfG0ByiD2W2qHEzX/gm /wiMGq2G7eRL9bQnorT1Xf0YLYd1bmWnM8UjMPXWbhywtLhCVASn7GPQzbZ7S4wv1 cqlVmKAiMgQcMwTPn1R0JJrHCPxwI9agcVrOwL3sW2Pq0PluWvMp3iCiOcOnaroWK PDcBMvc4XaresTDMJiQNjrPZdL4rgTaqFxiSHO5V13MU2iSLmgo0rx0HPZqNH2aD8 bEau4rp7qY0HTzfDUi3mUCFdho2IJAqaGBiMl79XkLwe3ejaFNvekidvYGzb0MLmz F6l7Q1XCGj2t5E/lKg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.86.95]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MoeY7-1qrrO11gfh-00og42; Mon, 01 Jan 2024 18:00:20 +0100 Message-ID: <7daa06c8-7d96-4126-a182-ca4c5e67f7a4@web.de> Date: Mon, 1 Jan 2024 18:00:15 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: bpf@vger.kernel.org, kernel-janitors@vger.kernel.org, Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Hao Luo , Jiri Olsa , John Fastabend , KP Singh , Martin KaFai Lau , Song Liu , Stanislav Fomichev , Yonghong Song Content-Language: en-GB Cc: LKML From: Markus Elfring Subject: [PATCH] bpf: Improve 11 size determinations X-Provags-ID: V03:K1:v86Vs62BHchJJKAdMgD0EeqotTgVb0nTmYvBzO0cZeKqJd1f400 +UhG3FpnfGq+PKC4UW1p3808eZlsff5Ui+Ah22uG1s98RbLPttCcyL1Q1V7h04lnkPpXtqw 0K3G4qKn+8AkaaeH2+sv9KMFT9fP3VXMXQeq68bJzm+SPexeCZbWSkqBEC4ceSaAM1OdNKj 5GWUR7EHjhLiZ+oGH7FTQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:YbwE0/JINh4=;3Hutg4rS2LnlMHt7cy+e1dNqYib YecUKMHgDWj7bgWjKqXcNqpBR6mqT0IwZMtnYyd5V4UFHjZrAYoOmvU6qtCPRmGnultiPwF1Q pe1Yb3nGWWmLhkQZ+bPTAlyPKf12h6OiqEN9CXQ+5TJJP+g1NTsrsFrQDPMCFfcU+VJDh4RDs kslF20c8Du6P4+GYA76hEGNIgDgjrxK+vQIFobcSbsrNczeIU75YcjTz1LBWHzEF0K/g0omyP Gja+SDsP/r8N9e49R2HXkOi2RFneBtxnxac9ImtBXYTAuVXo6h8P9pdediafMNLYiiyOb1Ilq dEYYWyHbBybz/yexAYSq0u5wnDrGY4Ps3mqraCED83UrqOdVICA5Dkp0HbvSV8V4Kj2P9Pe3s a8geLIo1vcDEeLwjmQ0N5b4uTQu1bXUGrzN9QvCDCkuv8BXWknrupndioXINdcxEB6azG91QG O/Z3nQELZuqXW1v5JVo2qfYrtpnN4yYMn9XjVsHzgWjtmgbTOEdujFXwfmdN54p7U1NqXWRQt j6FXVWmYHAtPOC/osvd5zgssDl2A1WKxdqYlRu7VbkjE5eOwZFbQ+hAFtLDfzDkoCgXyKRqBU B8a64oc4RNAWoRzNrSogjv+mQOruEY6K1WtQ9l/xSs15Cjn2rLnQs6jY2et+MYDbWYCAPMVG5 dMGlXl1MWisGaM5sLUQlGxbHERW/luNqiFpTMZgopmR8yB6EcQ/kKBVusbt0H6RFTGILeXmg8 uyvImsdIJMnhGm6Mpug//We/5WzsnKgRLEcR6PDxLU4v/UiF6Sr0SwLxMIQS1YUOfK1hPhVKg Uwx+wLOTjer4YRJ8L4z2skj8NFgnIMkuRJrGkMJTOUCrPiSlsvgg8mmbCcNFw1pIWM+4xDGz3 HkBrL+UeKgND/PJ8V5DIqc1klTHMh6Bi1ceMSGVLRhRt3CJABcS+e+RIi2pZQ9jkgq5tPkuHr bPSWRA== X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786908228868699768 X-GMAIL-MSGID: 1786908228868699768 From: Markus Elfring Date: Mon, 1 Jan 2024 17:33:55 +0100 Replace the specification of data structures by pointer dereferences as the parameter for the operator “sizeof” to make the corresponding size determination a bit safer according to the Linux coding style convention. This issue was transformed by using the Coccinelle software. Signed-off-by: Markus Elfring --- kernel/bpf/core.c | 2 +- kernel/bpf/inode.c | 2 +- kernel/bpf/local_storage.c | 4 ++-- kernel/bpf/lpm_trie.c | 2 +- kernel/bpf/verifier.c | 13 ++++++------- 5 files changed, 11 insertions(+), 12 deletions(-) -- 2.43.0 diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index ea6843be2616..1ae7b3054424 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2517,7 +2517,7 @@ int bpf_prog_array_copy_to_user(struct bpf_prog_array *array, * bpf_prog_array_copy_to_user(..., cnt); * so below kcalloc doesn't need extra cnt > 0 check. */ - ids = kcalloc(cnt, sizeof(u32), GFP_USER | __GFP_NOWARN); + ids = kcalloc(cnt, sizeof(*ids), GFP_USER | __GFP_NOWARN); if (!ids) return -ENOMEM; nospc = bpf_prog_array_copy_core(array, ids, cnt); diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index 41e0a55c35f5..2189760bdf0b 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -827,7 +827,7 @@ static int bpf_init_fs_context(struct fs_context *fc) { struct bpf_mount_opts *opts; - opts = kzalloc(sizeof(struct bpf_mount_opts), GFP_KERNEL); + opts = kzalloc(sizeof(*opts), GFP_KERNEL); if (!opts) return -ENOMEM; diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c index a04f505aefe9..75dba32cf91c 100644 --- a/kernel/bpf/local_storage.c +++ b/kernel/bpf/local_storage.c @@ -313,7 +313,7 @@ static struct bpf_map *cgroup_storage_map_alloc(union bpf_attr *attr) /* max_entries is not used and enforced to be 0 */ return ERR_PTR(-EINVAL); - map = bpf_map_area_alloc(sizeof(struct bpf_cgroup_storage_map), numa_node); + map = bpf_map_area_alloc(sizeof(*map), numa_node); if (!map) return ERR_PTR(-ENOMEM); @@ -511,7 +511,7 @@ struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(struct bpf_prog *prog, size = bpf_cgroup_storage_calculate_size(map, &pages); - storage = bpf_map_kmalloc_node(map, sizeof(struct bpf_cgroup_storage), + storage = bpf_map_kmalloc_node(map, sizeof(*storage), gfp, map->numa_node); if (!storage) goto enomem; diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c index b32be680da6c..3a69155d4ef3 100644 --- a/kernel/bpf/lpm_trie.c +++ b/kernel/bpf/lpm_trie.c @@ -643,7 +643,7 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key) goto find_leftmost; node_stack = kmalloc_array(trie->max_prefixlen, - sizeof(struct lpm_trie_node *), + sizeof(*node_stack), GFP_ATOMIC | __GFP_NOWARN); if (!node_stack) return -ENOMEM; diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index a376eb609c41..98c1dd43670b 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1677,7 +1677,7 @@ static struct bpf_verifier_state *push_stack(struct bpf_verifier_env *env, struct bpf_verifier_stack_elem *elem; int err; - elem = kzalloc(sizeof(struct bpf_verifier_stack_elem), GFP_KERNEL); + elem = kzalloc(sizeof(*elem), GFP_KERNEL); if (!elem) goto err; @@ -2374,7 +2374,7 @@ static struct bpf_verifier_state *push_async_cb(struct bpf_verifier_env *env, struct bpf_verifier_stack_elem *elem; struct bpf_func_state *frame; - elem = kzalloc(sizeof(struct bpf_verifier_stack_elem), GFP_KERNEL); + elem = kzalloc(sizeof(*elem), GFP_KERNEL); if (!elem) goto err; @@ -15913,8 +15913,7 @@ static int check_btf_line(struct bpf_verifier_env *env, /* Need to zero it in case the userspace may * pass in a smaller bpf_line_info object. */ - linfo = kvcalloc(nr_linfo, sizeof(struct bpf_line_info), - GFP_KERNEL | __GFP_NOWARN); + linfo = kvcalloc(nr_linfo, sizeof(*linfo), GFP_KERNEL | __GFP_NOWARN); if (!linfo) return -ENOMEM; @@ -17161,7 +17160,7 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx) * When looping the sl->state.branches will be > 0 and this state * will not be considered for equivalence until branches == 0. */ - new_sl = kzalloc(sizeof(struct bpf_verifier_state_list), GFP_KERNEL); + new_sl = kzalloc(sizeof(*new_sl), GFP_KERNEL); if (!new_sl) return -ENOMEM; env->total_states++; @@ -20003,7 +20002,7 @@ static int do_check_common(struct bpf_verifier_env *env, int subprog) env->prev_linfo = NULL; env->pass_cnt++; - state = kzalloc(sizeof(struct bpf_verifier_state), GFP_KERNEL); + state = kzalloc(sizeof(*state), GFP_KERNEL); if (!state) return -ENOMEM; state->curframe = 0; @@ -20717,7 +20716,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr, __u3 /* 'struct bpf_verifier_env' can be global, but since it's not small, * allocate/free it every time bpf_check() is called */ - env = kzalloc(sizeof(struct bpf_verifier_env), GFP_KERNEL); + env = kzalloc(sizeof(*env), GFP_KERNEL); if (!env) return -ENOMEM;