From patchwork Thu Dec 21 20:38:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 182447 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp679469dyi; Thu, 21 Dec 2023 12:49:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6RZaWpz7eBnMHZ4bZGoDNjNClyiesQkAGTtHtr4zY/7oh6kopDdRJY4W1NTvuc+uV8pQZ X-Received: by 2002:aa7:88c3:0:b0:6d9:6081:602c with SMTP id k3-20020aa788c3000000b006d96081602cmr297542pff.19.1703191757032; Thu, 21 Dec 2023 12:49:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703191757; cv=none; d=google.com; s=arc-20160816; b=e30xFBEU4Y9kUuQFxiDLXJwtmBk6iEjZ42C81nfCpS9sdFSTSChecIaWe8QjqY5aTG 5WrgVE17tAr4iV6vOi5vFgSYyEaMR1jKEB6Alt0kvjgwxVByXsY8ax/Kp/EbmL9m4gTv N3YqaqgFlmz6nL496oI8+8+I1cS75JC7f3C/nDb/H92NhaIRuzIzMu9U1bfwQk0vyCQj E7FuD68sUIHejEi5MRMEmR7J3wNcSeQA8lRJ1/yzLQUsCsXM9D0xrc5DsydhadeYmvMh 2pb301Upe6GSza/pMr3eNnF9gpgIdSciKeXLSUknhMNt9SsSbSDiJAlvTDNOd+XXxZT5 gQFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:message-id:content-transfer-encoding:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:subject:date :from:dkim-signature; bh=fUBAIuok57DNMEpco/8nLt0q2A89F15n6uhJk3GY1so=; fh=LKUX993GSTtawIcs7LMiYSJ/7nN/M/rqymLBiK7PRW8=; b=PbnZPlQkFMLMXHbG7V+6VDD7oZhLCIoblSpGClnfFYkD3KSpBG6JIa4Vn0t2cVnMJh 9s2lHjOww0vP24L3lX+VDFNu5+MJ4qsIVwqhX36zk2jr1zqcCD4TCoWuT7pDiXTcvIpa kS2yDpoBsPQ1lnWyRhGmHYVTbX98i1AUJGp5NgjlRbubXwjW7Q5DOlXVaBtiu0HpCjGG I3IyQp8VLY2Ueg77Kr/Ya5bkgGIoCVb6OG788uSoU4hs7ostXXmBoZ7acMQ9ra6S7CbR sn2Ybu6piNSrnxG2fylt8AvhC6yHcMUpJ4xiXFFPSL1jmMVx+PofbPQyi04nd5Apu3RG fcPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Pkq6TDeA; spf=pass (google.com: domain of linux-kernel+bounces-9054-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9054-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id cq19-20020a056a00331300b006d93395dedasi2104681pfb.161.2023.12.21.12.49.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 12:49:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9054-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Pkq6TDeA; spf=pass (google.com: domain of linux-kernel+bounces-9054-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9054-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 384D0289212 for ; Thu, 21 Dec 2023 20:39:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9674376DA2; Thu, 21 Dec 2023 20:39:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Pkq6TDeA" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F11C2760B8; Thu, 21 Dec 2023 20:39:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BBD8C433CA; Thu, 21 Dec 2023 20:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703191140; bh=NMCNTOGjIUtjnoYrDj2+Py8VXq1beUxtq9Z1hpoLDOQ=; h=From:Date:Subject:To:Cc:From; b=Pkq6TDeA6ngQsrhYyVqQm/idj9fXZtFQtsuSbSopT6bzKYv28z4XiEQFJ/5BLNLJy Rk/05qVu8QpEkS8EYnVR7ra86Pyx40hiU3RnlzLCEhjMVgEPox7TZiOHJzxTFBM+DB C0nHQRHbw1wO3aPy4PF0PLijGu8Y1dc9W+HRqerOgt1EC3SF9cdswrgLBZPNjJKx0v pH/VzfezIRm71wm6HJT5L92Sq03yXUCN1ObsbeeQJX8iFnOcUPULc4qzBtzzEtmpeN uoLwgAgRDyWzEJhOAedouy/GuYgXj8C6n/bzhj9hwzVKT03CKXBCtmeGALmH1vpfzM pl9TL+WXyck1Q== From: Mark Brown Date: Thu, 21 Dec 2023 20:38:48 +0000 Subject: [PATCH] lsm: Add a __counted_by() annotation to lsm_ctx.ctx Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231221-lsm-fix-counted-by-v1-1-12cc27597cdf@kernel.org> X-B4-Tracking: v=1; b=H4sIAFeihGUC/x2MSQqAMAwAvyI5G7AR3L4iHqpNNaBVWhVF/LvF4 8DMPBDYCwdokgc8nxJkdRFUmsAwaTcyiokMlFGuiBTOYUErFw7r4XY22N9oa2sqKpkKrSGGm+d o/NO2e98Pp1ZjTmQAAAA= To: Paul Moore , James Morris , "Serge E. Hallyn" , Kees Cook , "Gustavo A. R. Silva" Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Aishwarya TCV , Mark Brown X-Mailer: b4 0.13-dev-5c066 X-Developer-Signature: v=1; a=openpgp-sha256; l=855; i=broonie@kernel.org; h=from:subject:message-id; bh=NMCNTOGjIUtjnoYrDj2+Py8VXq1beUxtq9Z1hpoLDOQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlhKJhcHJcTcKYxgKCegncjDqmRlmBIi6dxCHmcStR /v7DxBWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZYSiYQAKCRAk1otyXVSH0LZ2B/ 91niFJEPlxuNvwaLVf8Borg/kzwBNfXZHOzrVQ1pmEzl/ULhg4pQBoRUtDcPR4zvEU0jvs506fiJR7 ob+A6xca+oAIvyUiohTJa6cCgVlYpGXS6H1pzPe8wIeysWjrkivsfjw0+qAYD8f8rUPd0H0TQ9Eb24 /yRITWpBTY/u9WdncGgLZHogYpMHC2XtXIz8Y2HeMU36mx51anGb7Rku6gTGG+upZWnkR9Bk/nqzl6 gkUCM24nA832MoTh3FpUA+qLJGcpB3K9oRQNCZDqr0l8S8vafQZaOLRJnQSMmjT63Fy2GyE4oGznr5 PirKGhhlwDKvAHNNXD/T5EMgjNgKH1 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785925999910834869 X-GMAIL-MSGID: 1785925999910834869 The ctx in struct lsm_ctx is an array of size ctx_len, tell the compiler about this using __counted_by() where supported to improve the ability to detect overflow issues. Reported-by: Aishwarya TCV Signed-off-by: Mark Brown --- include/uapi/linux/lsm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: ec4e9d630a64df500641892f4e259e8149594a99 change-id: 20231221-lsm-fix-counted-by-f9fd827e26aa Best regards, diff --git a/include/uapi/linux/lsm.h b/include/uapi/linux/lsm.h index f0386880a78e..4150333d224f 100644 --- a/include/uapi/linux/lsm.h +++ b/include/uapi/linux/lsm.h @@ -36,7 +36,7 @@ struct lsm_ctx { __u64 flags; __u64 len; __u64 ctx_len; - __u8 ctx[]; + __u8 ctx[] __counted_by(ctx_len); }; /*