Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp1396428lqa; Mon, 29 Apr 2024 07:27:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWrWbAoQVqAQNyUPzFczJe4f0HOLHzbPUQze3An7THh9TTVdtm5E4mWbzyaYRGW/5vEoAWjdNY2lIqk3lQdeN4bn6k0DqiwIHD0Rslcog== X-Google-Smtp-Source: AGHT+IHauRHdZ2rnNLbvd+wIWZljEGw5MmieU/9xIMdtfQA2634tFl86CeNcI6ndxQb04Sw2nKOV X-Received: by 2002:a17:90a:ea04:b0:2b2:da7:2c83 with SMTP id w4-20020a17090aea0400b002b20da72c83mr1984880pjy.4.1714400850896; Mon, 29 Apr 2024 07:27:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714400850; cv=pass; d=google.com; s=arc-20160816; b=1IoVG9+nG6WFD9HnG+hY9Co6xCeFW+gVVSZmRptVjSIninrMY6/KleFH5A8bQnKsiD 6JHLK7M8WB6lzlGNjjyDdWjBNnSWMj5jiou0q5WAiiZXyMSpJORwriQ47Sja4jBV4IEB WXULjHzD3EhLAF5I0jPX7d8A9l+UR9/Ru4DGfD/DAsXGriq0NE3FwgGHy03SOhWgjOvc PtwSCNJ0we/ahQ0xmYgyHoNbTkbJeTR58M+oJ5BExQXiI/qZrHfXa8SD5lP1m79Vk6Sg OPcl5oXaQvxxggXTrzRGcFLKzv/71NttwuTMNKsTGbgvqfJg+RTtimaIY+ZDM8VAi3iM CZ4w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=mjKJad1y7Sk2S/Vwvptaugh4stR2X49c/2y7OdxQFbo=; fh=/aV4zCO9AZy5PpGq6rbnd7vL2iCF/IqaXkQVKNavVgU=; b=HkFeGnXMdQ5XCmoB5ow63MoaAu5YQL2w/wnBbXB6Navk+lSk35+qOkhFYQFoC6gs30 hcwyeG3ulDE3xKfED1F18CslVQx+HKogAEuHfeOMQsmoa6rcvNTuhWQi1nAbfKbbSKm1 xgy+yffnzDsgpT9WJkV7fxjul8Dxtv/Eckbt1JWfo08vzZ71tpLKV2bBv5SmwM7wNXFr F7Zi+uRaIbug/BV5g32jKxPG0K202/B3qKb7zV83D3+9Dse1AZxyeZXblRJj/1L7laWj qBn7mrxx2e0JQjfR7cFHm8ytGiPeafvl3HGCCoU4l2S3tq0IVRQx7n8Ti9lT8Ti8gy6r WLgg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="j8u6Ry/C"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-162215-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-162215-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id v11-20020a17090a898b00b002b0f562ef46si3956611pjn.68.2024.04.29.07.27.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 07:27:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-162215-linux.lists.archive=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=@intel.com header.s=Intel header.b="j8u6Ry/C"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-162215-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-162215-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 9E87BB25DA7 for ; Mon, 29 Apr 2024 12:15:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E8B616D1D8; Mon, 29 Apr 2024 12:13:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="j8u6Ry/C" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 C81ED5474D; Mon, 29 Apr 2024 12:13:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714392811; cv=none; b=GyDI2KQK0B3hLqzsqVgBXjq9IwhphvQTYdgwLcfYhF5HU8kd8AXFGZXnvPdKWJWvp+ZtTU5WIn0WdSxbp99d32y/ZF/T5/T6d8TMxXkbYavYPz56TYFy7svwTgiNZFshOgR97AYmZoNi9D+SFPRlfMezG6MIfLGZuzoNRCoPCUg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714392811; c=relaxed/simple; bh=0IDV4wwXjhB7GAsTZK4UtfbDqgXcZqHx4iXcoFYyL98=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TS9X8pJR6x5DFnuolRv40z7zM7FuEkUELyMTWMoymacsfULxCB9OJKB9cK0VqdZxjbEGlpsKorW32Km3lv8zlYm/LM7nlsRsZYD9qF7Cb3NrLCr8gmhMfBAzQQtnuUrQdj4nsNhb+BZo8Ji3xtrQlevhnfAWnLAIdlsqG6gJCOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=j8u6Ry/C; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714392810; x=1745928810; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0IDV4wwXjhB7GAsTZK4UtfbDqgXcZqHx4iXcoFYyL98=; b=j8u6Ry/Cd1X3xeoM9dPpMUPXf2MzXrN9NnTIhdxYeSha1g8xW5NVexew gzp5YZoNZxZdtYghF+N4FhU0BHSHCHTb5jMnSCyEMvy6DscOgdki5B4OD jtdeQbKJ4JgRtyijMrdzUQdbSFlCL3hDlP047sqJXyD+GvZZ2+Pz051DN oph6+n1PKzUcmsCccRzJdh7TH8lnAHBS7OEe8hXjq973YpPWLQjc4lVMk A9MVXrR//dLPUnB+km2770Ul8e4+PPL3m8PjO5pnWAghhlLgdkm3NeUy+ lAHQPs0GHWfs6zZGxcVxFsDW7ClktpX1NgXxUl3ZQfUVA4URrW55FeTbc g==; X-CSE-ConnectionGUID: nV1uzaFQQ/Gm3SBINfkdBA== X-CSE-MsgGUID: vJSuUidrQFyG6KLVVYr92Q== X-IronPort-AV: E=McAfee;i="6600,9927,11057"; a="35440894" X-IronPort-AV: E=Sophos;i="6.07,239,1708416000"; d="scan'208";a="35440894" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2024 05:13:29 -0700 X-CSE-ConnectionGUID: HP79hpQ0TC2blCYLTzid+g== X-CSE-MsgGUID: iY5ZkRPpRS2Ky2XYZSEJfg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,239,1708416000"; d="scan'208";a="26603701" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa007.jf.intel.com with ESMTP; 29 Apr 2024 05:13:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 23FDA15B; Mon, 29 Apr 2024 15:13:24 +0300 (EEST) From: Andy Shevchenko To: Alexei Starovoitov , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Borkmann , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Andy Shevchenko Subject: [PATCH v1 1/1] bpf: Use struct_size() Date: Mon, 29 Apr 2024 15:13:22 +0300 Message-ID: <20240429121323.3818497-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use struct_size() instead of hand writing it. This is less verbose and more robust. Signed-off-by: Andy Shevchenko --- kernel/bpf/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 778775bdbb2e..6047979d5be6 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -2455,13 +2456,14 @@ EXPORT_SYMBOL(bpf_empty_prog_array); struct bpf_prog_array *bpf_prog_array_alloc(u32 prog_cnt, gfp_t flags) { - if (prog_cnt) - return kzalloc(sizeof(struct bpf_prog_array) + - sizeof(struct bpf_prog_array_item) * - (prog_cnt + 1), - flags); + struct bpf_prog_array *p; - return &bpf_empty_prog_array.hdr; + if (prog_cnt) + p = kzalloc(struct_size(p, items, prog_cnt + 1), flags); + else + p = &bpf_empty_prog_array.hdr; + + return p; } void bpf_prog_array_free(struct bpf_prog_array *progs) -- 2.43.0.rc1.1336.g36b5255a03ac