From nobody Sun Feb 8 11:23:06 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0980914B957 for ; Mon, 9 Sep 2024 16:28:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725899334; cv=none; b=jpafmbpkvs0rgBTw7/lKCq3eOpMS+sYgw/W8sPt3Cv0SZIwshkHWdA/xclng3xhKaBfahuwuVDDqf97j4J8HZKFbZ8WDfXOypGvLtw9rPJMyb52q7mgvRScR7/rcDNsBYWmY5t3897+HlFJzyrSlkeccJEF0W8kz93oRX6mJDN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725899334; c=relaxed/simple; bh=8RdcJvVv3gShrKDsP0JLU8Wsg0kuGNpupzjo7uvrHe8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RbA68lLI4YSpoMTnuyUBxU6kPTlEFm6FtcvgpHp2QGMYpvPPMkA+9WVNLBlBE2smYO61FYBZ1A7Bue0BtpK8BFUe3tNWlNZV+o35rME1Q+GuOARNF69LRis7XpVW52EqVmS80x5UkgrqmMFAj5FMZetgI37xYuluR/AHaNVcLls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toblux.com; spf=none smtp.mailfrom=toblux.com; dkim=pass (2048-bit key) header.d=toblux-com.20230601.gappssmtp.com header.i=@toblux-com.20230601.gappssmtp.com header.b=0mCeY7U9; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toblux.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=toblux.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toblux-com.20230601.gappssmtp.com header.i=@toblux-com.20230601.gappssmtp.com header.b="0mCeY7U9" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42ca5447142so4718905e9.2 for ; Mon, 09 Sep 2024 09:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toblux-com.20230601.gappssmtp.com; s=20230601; t=1725899329; x=1726504129; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rjrTEbgn235rhvAj96iSdJKR0hzx2vUIB4UjFS1NRO8=; b=0mCeY7U9+v8Yaxk+q7lB5Ts7Hc1XKx75LhJs4qILill8Ly9ZDkqZfrcgSzkXDTB5fz dPJErt0l4vGGLZYOnfk+HVbBs15fxIKR/Oc64B96oWiWKT/AGY9dOTWnGm98/M7rMLd5 7Y2+XoYvpgnf7N5Lbfj+AtlYC8kOmcSm05hJt6IBGfVI5EiKV4PYxhTFV6ijZKZvNoW0 MJeL+crYTJBSxHGcYgmqTDjp+Kz3L0fWzF/uEjuyT+cqAs/+PKL4xMkjUSfXEwtG3yry k7GapwyGu7p47uWwd/6MAUd9TlIxNjhRCL6kH5vBvznE6BmkeNOPq8rjz90XC2nstxrM yHBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725899329; x=1726504129; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rjrTEbgn235rhvAj96iSdJKR0hzx2vUIB4UjFS1NRO8=; b=ksk+7X9Pu0h2H8irsP4CykD/Gd/fONni/aCubQvzEyu51bQfP/fPqzgTPMyejTCLT9 4a0+mUSw9GQ3vQkm9UzBAtldTxyaS64B083JiGL3lFYdOJ0NUQ6uQfz59qxl+SgfZqX7 VHc1gf+SmW2Ep4Ab44t6xq7tNNeVTlAa2k67VN2CoCpTsbEJ+y0IPelFR+klXPmnWd0G vVGjqceA5wVw/8tU5XL8A2W6DNwSsi14S9e8IMF5rds6GHWyzAu/cxAz+JtIQIuVi7mk EZr2aEh+zRmLFXREI1WlRY3uYbveCXQRGqQ3QjSo3dU0lS5ZE6EAZM4mwb2y5TcMztea Jznw== X-Forwarded-Encrypted: i=1; AJvYcCXEeb4/wY/veOyWXMNdUc07plmm5nvWH+JX3o3/6Gi/Ia74TlL7qbU7tO8CJlUK1RdoZGtnF/2r0XnAVhs=@vger.kernel.org X-Gm-Message-State: AOJu0YzK54KXsAAs4H/NVH+GOjKATSZhRc/2kexa3P/HtTnEyVfw/RNH wvonOSI9vCuNREyyc8vxzl+uOI/TaETKWI+psKFJcq4dtw5C2qdtIFq8py+bAXFrFWHUpjg3TEH L X-Google-Smtp-Source: AGHT+IHMA7sheFihP/wz+0UUpBWh26J4I+Iug17IMwFpurdhQTex0X62Km8uClHjOvSiTwLEzsQfGg== X-Received: by 2002:a05:600c:4707:b0:426:6fc0:5910 with SMTP id 5b1f17b1804b1-42c9f97bde0mr41860165e9.1.1725899329044; Mon, 09 Sep 2024 09:28:49 -0700 (PDT) Received: from fedora.fritz.box (aftr-62-216-208-120.dynamic.mnet-online.de. [62.216.208.120]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb8182dsm82078765e9.36.2024.09.09.09.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 09:28:48 -0700 (PDT) From: Thorsten Blum To: kees@kernel.org, gustavoars@kernel.org, andriy.shevchenko@linux.intel.com, mcgrof@kernel.org Cc: linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [RESEND PATCH v2] params: Annotate struct module_param_attrs with __counted_by() Date: Mon, 9 Sep 2024 18:27:26 +0200 Message-ID: <20240909162725.1805-2-thorsten.blum@toblux.com> X-Mailer: git-send-email 2.46.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the __counted_by compiler attribute to the flexible array member attrs to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE. Increment num before adding a new param_attribute to the attrs array and adjust the array index accordingly. Increment num immediately after the first reallocation such that the reallocation for the NULL terminator only needs to add 1 (instead of 2) to mk->mp->num. Use struct_size() instead of manually calculating the size for the reallocation. Use krealloc_array() for the additional NULL terminator. Signed-off-by: Thorsten Blum --- Changes in v2: - Use krealloc_array() as suggested by Andy Shevchenko - Link to v1: https://lore.kernel.org/linux-kernel/20240823123300.37574-1-t= horsten.blum@toblux.com/ --- kernel/params.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/kernel/params.c b/kernel/params.c index 2e447f8ae183..5f6643676697 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -551,7 +551,7 @@ struct module_param_attrs { unsigned int num; struct attribute_group grp; - struct param_attribute attrs[]; + struct param_attribute attrs[] __counted_by(num); }; =20 #ifdef CONFIG_SYSFS @@ -651,35 +651,32 @@ static __modinit int add_sysfs_param(struct module_ko= bject *mk, } =20 /* Enlarge allocations. */ - new_mp =3D krealloc(mk->mp, - sizeof(*mk->mp) + - sizeof(mk->mp->attrs[0]) * (mk->mp->num + 1), + new_mp =3D krealloc(mk->mp, struct_size(mk->mp, attrs, mk->mp->num + 1), GFP_KERNEL); if (!new_mp) return -ENOMEM; mk->mp =3D new_mp; + mk->mp->num++; =20 /* Extra pointer for NULL terminator */ - new_attrs =3D krealloc(mk->mp->grp.attrs, - sizeof(mk->mp->grp.attrs[0]) * (mk->mp->num + 2), - GFP_KERNEL); + new_attrs =3D krealloc_array(mk->mp->grp.attrs, mk->mp->num + 1, + sizeof(mk->mp->grp.attrs[0]), GFP_KERNEL); if (!new_attrs) return -ENOMEM; mk->mp->grp.attrs =3D new_attrs; =20 /* Tack new one on the end. */ - memset(&mk->mp->attrs[mk->mp->num], 0, sizeof(mk->mp->attrs[0])); - sysfs_attr_init(&mk->mp->attrs[mk->mp->num].mattr.attr); - mk->mp->attrs[mk->mp->num].param =3D kp; - mk->mp->attrs[mk->mp->num].mattr.show =3D param_attr_show; + memset(&mk->mp->attrs[mk->mp->num - 1], 0, sizeof(mk->mp->attrs[0])); + sysfs_attr_init(&mk->mp->attrs[mk->mp->num - 1].mattr.attr); + mk->mp->attrs[mk->mp->num - 1].param =3D kp; + mk->mp->attrs[mk->mp->num - 1].mattr.show =3D param_attr_show; /* Do not allow runtime DAC changes to make param writable. */ if ((kp->perm & (S_IWUSR | S_IWGRP | S_IWOTH)) !=3D 0) - mk->mp->attrs[mk->mp->num].mattr.store =3D param_attr_store; + mk->mp->attrs[mk->mp->num - 1].mattr.store =3D param_attr_store; else - mk->mp->attrs[mk->mp->num].mattr.store =3D NULL; - mk->mp->attrs[mk->mp->num].mattr.attr.name =3D (char *)name; - mk->mp->attrs[mk->mp->num].mattr.attr.mode =3D kp->perm; - mk->mp->num++; + mk->mp->attrs[mk->mp->num - 1].mattr.store =3D NULL; + mk->mp->attrs[mk->mp->num - 1].mattr.attr.name =3D (char *)name; + mk->mp->attrs[mk->mp->num - 1].mattr.attr.mode =3D kp->perm; =20 /* Fix up all the pointers, since krealloc can move us */ for (i =3D 0; i < mk->mp->num; i++) --=20 2.46.0