From patchwork Sat Feb 10 01:16:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 199174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1234582dyd; Fri, 9 Feb 2024 17:17:48 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUycaCOL1O99YWPk7DXUcBFjLF378C8nLWUP2qBKtLaQvtD816v6xCrL2MCE3faRHyEvoldHTLsKzDhFZ9dcS+zitsyFA== X-Google-Smtp-Source: AGHT+IHF1o/Era518JotEv7CzHcERzlxsn0shxMqXN3ty3Or3QRKnuh9LqXtz52pLMOREqp44rsf X-Received: by 2002:aa7:d951:0:b0:561:aa3:f9e6 with SMTP id l17-20020aa7d951000000b005610aa3f9e6mr381695eds.15.1707527868344; Fri, 09 Feb 2024 17:17:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707527868; cv=pass; d=google.com; s=arc-20160816; b=tmN3ESLCcUPzl2zKTmejParER1sn5/XW/mI2Fpf2VflY1FfSi8TKi2RjNsmXrJauio XiSxU8FLp6c1Z1/YWWI91w809wbZ0Y39aFqNMeIrGidIzKDAW1aA0XSk2KkFsL+kFPl0 cs627xmIm5w98K7fnHYHzId6kF10RnrBd1Q1yJD61rh+6QY+ByvetnuyV1TeDVDs7oK6 rcSunf0qftkh/4Gink/a/vGawjHYkMK0Wm84OM/4Tl1i87/2z81LU/d5XsW/GbPjrDDw OfQa8os3QulsuhhEYe1J7cEvT8ACoBJKqNuvk23OGyaJUqBS9BdlxshdGvVvByJ7dbTs gWZw== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3Ze5Pa4NcSME/+yvLBfrb6tRG6ghxrx7Dfdjk9njymg=; fh=72AtNmTJq/Iv05OGRbMBDmMPTySGWvYKN4szZOctbP8=; b=ncb76Rf8hZS3MmcRTZtFRDv1ZrGFskUzDvDo/2b2nGn8pGrPsSy2TEyAM6YqYWH31Q TA+f/k5vw+fWt+wAgGNX++O92owLN2VQmxXgNXFfZPgQODp7AdP+X7+u5WP/oyCaGxS/ xREs9TI9RdHSkXaSHrc/B6cWl6p7Cv+YkEVBX5yXdOVS7Ty4NvCownUtdlCs7OHh9NdU UJBtkt+f59NLfqULj6ajwdh3dDclsjqvWA1RXTOuQMD9WzDUY89vB1kQw5lcwosDBjnu 3YwEhG/jAHXffpJT1T1s4ZZC1o/oLMUxF1gzCmlvy1VaBtL0uFjFYzwNOsgCCZtY2ln1 as5Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aV2T8cIw; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-60211-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60211-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org X-Forwarded-Encrypted: i=2; AJvYcCUtAo6kYV5bBrfQaNxUN4rZzwYOor+87JZ2g/rT60dnaWBeS20JujOr5ubvwz307m1RUEQrkU3wfvpB6hJgtZz6Abs8wg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id w12-20020aa7cb4c000000b005615b840203si313220edt.513.2024.02.09.17.17.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 17:17:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60211-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aV2T8cIw; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-60211-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60211-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.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 am.mirrors.kernel.org (Postfix) with ESMTPS id C96E51F24240 for ; Sat, 10 Feb 2024 01:17:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 574BD17BD2; Sat, 10 Feb 2024 01:16:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="aV2T8cIw" Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) (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 3DCAB3FFE for ; Sat, 10 Feb 2024 01:16:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527809; cv=none; b=gHqwGOul0XS3CbgaLxdNX3ymlRFmOSrLAsWMw1KIRkzrub9z6uYAdgRQ6ASZ1mMj2o3nWGw6DRxTRQuhnv3/g2/dRjkk5OO4v7Dn3l2mlrXkhXooi0QDAI4SCoKzSEVmZcTsouLhJvdwayGbG9RDB7AecVFbVyye+2ZBOiQD79g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527809; c=relaxed/simple; bh=UIYu98yTnq6IoG7p77xS2jBpkcg5lQjLVhPitCGvuaQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kgxmotuQOc/SEZGnVo+uFP5p/19MwEK8RSSMyWF2SDd923bNU125g3h8uPhSqpDDCNOvUGCR3e8/aje2vc0QgmI0TtXYPwJNsmampcGYDvvEpyqsTL30WwCUROCOtAGUwS6nF3FiShbYsW0c8LZoOmHEm+6elQKakK1UCg5XwiQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=aV2T8cIw; arc=none smtp.client-ip=209.85.160.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-218e3197784so860592fac.0 for ; Fri, 09 Feb 2024 17:16:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707527807; x=1708132607; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3Ze5Pa4NcSME/+yvLBfrb6tRG6ghxrx7Dfdjk9njymg=; b=aV2T8cIw3DOHGt4SuipZaxVPBB2seJ/i0KZIvbBECJd65MJauEM4Wb6FpyKljfseA9 HCOvNcmK72i6wwzzXXPhomTaNZRPaUicWtC9OPKI7LgsI91KjMdgUj2oxaPAJTz4nimG zScCKp5nSrQM0ypNQqE3s3fHGPYRaGlA9n5JI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707527807; x=1708132607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Ze5Pa4NcSME/+yvLBfrb6tRG6ghxrx7Dfdjk9njymg=; b=kCY9SzzbaHH3HVHtB3mufRZB/iDWcAmXF2B5lMrlidAC2G/uo4+9Pg1rTztHWNgzDW fwK9RxxwN3hlVyJcngpnj7O5QmspjvIcWOMhzLZxIEuRpKloK5cY/Gec0q/16QlwnEIF QM43bYOpV6M+ZHCY235lVmHwzJv62UNNSvS8fDAqt2wq7xyfF1L1AJGm1I3cTu39iXnR YCR4dW0g+5Gl24TW10fRGa7TZQ+ZRru2GFpIfMFbc5VGA5IsEfjcg73LpC1auMNsDI8+ FmS1kITzcanBqJpHmaMHXq278vblv4tP25AVt26MpVESfuD9sZL/6WKmEInwZa860hob 50GQ== X-Forwarded-Encrypted: i=1; AJvYcCUyMBlLG7Ur8Sec61VG1QDBtPzfVl2olxHQHp2BaMk/wCKuaArcpZAcOgQmqJACEWOo6Xh5dhX+g24PZZJDLh2uD5CP2fiLSGQ5fH3O X-Gm-Message-State: AOJu0YzLQNcJBReDROmBDVszX2a2WhrjvwlwrPt3TZtj2PsuREA4Hl9h +mB6YC8Vpzm+OfEl8p40amViJ70SX8fClndoI1qqkWqNA7wXSDVuViJcujjznw== X-Received: by 2002:a05:6870:d154:b0:214:9ce3:ed2b with SMTP id f20-20020a056870d15400b002149ce3ed2bmr1021019oac.41.1707527807338; Fri, 09 Feb 2024 17:16:47 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUy4hT6eVAzCHi32RCAeGUPnPW+nKJJ0FdWDQrrS0gzAB2CjD4XRvA2K6HnrTr4Pm5MQobuWSZNUTYa5ctaVh1oTw1PM8AXx5LHIAfQPN/HPzGsaZ3IytuOcvgT1C4nvRSCKm/OpSVT2YDde0/ct330RoSbt+xSIzvjF8AaLebL+BAemdVaIyMvDcmcz9bQHAuM8pfUEjt5mowTf7fOwu/nx1RP0Wunjy8O1hJd097SyPY1PLza1V5Kas+RKYUDioe/bursi4YllNtvUS32G/8KYQF+4u7qhFT/61ZxUFB7mrKOFZsA6DkScUkrPWbC65b2dNMRPX1o0qBo24NmJzSvMqkd2lMeWEW0GPPzrN5Ma97cNijVsRIhpqB4XXyRb7hJX1Au8t0YuntshA7Mny1e6PLPfe9zvE6lTqInPviahXWQEh3A4dPw4jJ6I7oqITkZb9RDth0VyqGkJJU1EvrbHMUSBSLenk7bbbiwAsGvoOty6YH0FkLwjXmUxCiV Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id c125-20020a633583000000b005dc4da2121fsm2481005pga.6.2024.02.09.17.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 17:16:44 -0800 (PST) From: Kees Cook To: Jakub Kicinski Cc: Kees Cook , "Gustavo A . R . Silva" , Rasmus Villemoes , Dan Williams , Keith Packard , Miguel Ojeda , Alexey Dobriyan , Dmitry Antipov , "David S. Miller" , Eric Dumazet , Paolo Abeni , Nathan Chancellor , kernel test robot , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH 1/2] stddef: Allow attributes to be used when creating flex arrays Date: Fri, 9 Feb 2024 17:16:41 -0800 Message-Id: <20240210011643.1706285-1-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240210011452.work.985-kees@kernel.org> References: <20240210011452.work.985-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3916; i=keescook@chromium.org; h=from:subject; bh=UIYu98yTnq6IoG7p77xS2jBpkcg5lQjLVhPitCGvuaQ=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlxs565KmSp3fQbXTcJwGQKFvGMK3wEqdmQ7/xb uTx0bjHKlCJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZcbOegAKCRCJcvTf3G3A JhaYD/9JDBbI/XgOae54dbshjDoJ76Ha6DpLzDux/EAHjpeJ1+scXgSkqee2gAfC/wb9DvS1fgS 0deWCT0upE1Hv3YKcPr6aUv6nqbRTffqCDL1aX/TPdqBPNA1LSXPQFJj9fQJ8qtaJy90yivafd/ /luFZAr+qRIcKjRq2CJRmrknxXSIJD4kmI37X+9U2bG74t+XQuTOHeH4m47l5xMorFT5Njg+Emt Zr/Ls/vfK9KojTi7tirVLSLtHdJruvQtc3TXRAzsnv/UTeimSYzBlwxTN2dTeuCfjXdWe1MrncV UrAzhMcRtsUub7GAE3awCB8nX6FQaH1q8DCHrv3vpzVuboHBzOsSmYUbvO/9gMSr3rXqYO2FCR6 GtG+OP9DfWZmf8zCVLcWDsHy0qv5mUAXL5TUMyxR4REILeuHI65nhyxnGFZy+aC3zq35A/qJ7bm EcZPQy4GbvlKuvgEAIksnBOIJryiQkxWj/PvZAyIjPMEC6ttj2QRccFx6XhcOgHxtumDESQShik lJ1dk3K+ru9HaA2RDQ5ikQpn4IDFiItrGzuT4Z5NigIdlRcbdWKiTjt7+v2quTN9ZzQYQ+hA8pU t+0mGm+YTF7UOD23q10V/9LCAuGlhP1T7WMFc1/3H+Xui4Ljpd0BZV0i4jpfAEh7XreSEDWl1ep 5z3ELwYLKxghsYQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790472723873075075 X-GMAIL-MSGID: 1790472741927155639 With the coming support for the __counted_by struct member attribute, we will need a way to add such annotations to the places where DECLARE_FLEX_ARRAY() is used. Introduce DECLARE_FLEX_ARRAY_ATTR() which takes a third argument: the attributes to apply to the flexible array. Cc: Gustavo A. R. Silva Cc: Rasmus Villemoes Cc: Dan Williams Cc: Keith Packard Cc: Miguel Ojeda Cc: Alexey Dobriyan Cc: Dmitry Antipov Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- include/linux/stddef.h | 16 ++++++++++++++-- include/uapi/linux/stddef.h | 25 +++++++++++++++++++------ 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/include/linux/stddef.h b/include/linux/stddef.h index 929d67710cc5..eb51f6727ecf 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -81,8 +81,20 @@ enum { __struct_group(TAG, NAME, /* no attrs */, MEMBERS) /** - * DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union + * DECLARE_FLEX_ARRAY_ATTR() - Declare a flexible array usable in a union + * @TYPE: The type of each flexible array element + * @NAME: The name of the flexible array member + * @ATTRS: The list of member attributes to apply * + * In order to have a flexible array member in a union or alone in a + * struct, it needs to be wrapped in an anonymous struct with at least 1 + * named member, but that member can be empty. + */ +#define DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, ATTRS) \ + __DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, ATTRS) + +/** + * DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union * @TYPE: The type of each flexible array element * @NAME: The name of the flexible array member * @@ -91,6 +103,6 @@ enum { * named member, but that member can be empty. */ #define DECLARE_FLEX_ARRAY(TYPE, NAME) \ - __DECLARE_FLEX_ARRAY(TYPE, NAME) + DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, /* no attributes */) #endif diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h index 2ec6f35cda32..5499c08ad011 100644 --- a/include/uapi/linux/stddef.h +++ b/include/uapi/linux/stddef.h @@ -31,24 +31,37 @@ #ifdef __cplusplus /* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ -#define __DECLARE_FLEX_ARRAY(T, member) \ - T member[0] +#define __DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, ATTRS) \ + TYPE NAME[0] ATTRS +#define __DECLARE_FLEX_ARRAY(TYPE, NAME) \ + __DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, /* no attributes */) #else /** - * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union - * + * __DECLARE_FLEX_ARRAY_ATTR() - Declare a flexible array usable in a union * @TYPE: The type of each flexible array element * @NAME: The name of the flexible array member + * @ATTRS: The list of member attributes to apply * * In order to have a flexible array member in a union or alone in a * struct, it needs to be wrapped in an anonymous struct with at least 1 * named member, but that member can be empty. */ -#define __DECLARE_FLEX_ARRAY(TYPE, NAME) \ +#define __DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, ATTRS) \ struct { \ struct { } __empty_ ## NAME; \ - TYPE NAME[]; \ + TYPE NAME[] ATTRS; \ } +/** + * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union + * @TYPE: The type of each flexible array element + * @NAME: The name of the flexible array member + * + * In order to have a flexible array member in a union or alone in a + * struct, it needs to be wrapped in an anonymous struct with at least 1 + * named member, but that member can be empty. + */ +#define __DECLARE_FLEX_ARRAY(TYPE, NAME) \ + __DECLARE_FLEX_ARRAY_ATTR(TYPE, NAME, /* no attributes */) #endif #ifndef __counted_by From patchwork Sat Feb 10 01:16:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 199173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1234546dyd; Fri, 9 Feb 2024 17:17:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVjWU3rgcaDiCRC+UlzOYUWJGpHSObJNnddgh7NoCt6WSFdaFklKA/kU4VsI4YJU3NDgDtHn4SxemULiJGSnykCE1Mbfg== X-Google-Smtp-Source: AGHT+IH8ECTgIU3W72xV0gEsfuUIMgXXR8anlOZsj4dAWyWxvftDNG032dwnMHui0S10DUztFK2Z X-Received: by 2002:a17:906:3903:b0:a37:fb7d:6f21 with SMTP id f3-20020a170906390300b00a37fb7d6f21mr435957eje.51.1707527859145; Fri, 09 Feb 2024 17:17:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707527859; cv=pass; d=google.com; s=arc-20160816; b=0St1W+i6ETmP3zeBD2PQEX+A6lictECfiUOF3I7K656tKLpsZen/j+E4E56GUp6Tdi tGBOSH0zbqHFKtXTBqXlodMNEHttqdhW4jYpHqudPDt8frERQ3MO3MoAazXH+UZFYWbk yYvMA0V/XSxHom30eO17kv26yA8F6mhngxYf83XkA6CqvLEZaQY8LjC6Yf+LnRhb9Fvr k8VMgtTEjKMNV1fQrFJpjttK0D463f/V2OEUU7ImAOKSRJKzLLB8NYVQtNtNTUxbhNUe yHUod5nbfh9iixa304HGDQfNTTrmdRQ1rNGGFkhn7NpTKojshpTb42d4JPIiCfNCF7g1 dXSw== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8mUvX1itSorxxJJ/u/VSZ6UrN6IODCy16GtowaQvelM=; fh=K0rgJsJSpfTLdnVaCESVTwVQnbpVWL1spP6xa7Q/Ipg=; b=mtI8rPJwi+00jupczSlGVsfZ9chuCxMVtGyuk6GC+tSXKz+tg+JQoYpADwswACOrqS xFhx0RJ1W80KBSYLOPNyNpRukSWnBfQoQDZdyfoCeT2Q/JtsELf/CGri+3CG2myBXQjz e7IENbSKNLwQMWha5X21JIC+MLL0Nrzz9SjS96mBXaZCH2pyhFClGKOAeX3KtFicrZ9Z Yth3QZHyEO8lrqpWiKsUmVsJozHx49FA/Go/jTOsa1pW9BWGZEhOfAOLwZrr9H9y1rPq J6vX1xE0SCMz26dmqTR8bMRoIWtVMr9e5iw8+Rhsgn5q9Asu9EQlhy+QmdFBDXCeTd/p KbLQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=M8NdWIPI; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-60210-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60210-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org X-Forwarded-Encrypted: i=2; AJvYcCWZbYegqT4Bpo9+AyeX2KAvFg/QwLAA0NYyAxSncosBE907dss4+4Vl22kceLl//i5D7OXJFjw6SsZSWuzge2EgCUI38Q== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id h18-20020a17090634d200b00a389612f13bsi1411968ejb.995.2024.02.09.17.17.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 17:17:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60210-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=M8NdWIPI; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-60210-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60210-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.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 am.mirrors.kernel.org (Postfix) with ESMTPS id 870351F2437F for ; Sat, 10 Feb 2024 01:17:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4660A10A32; Sat, 10 Feb 2024 01:16:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="M8NdWIPI" Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.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 A0DCC1FDA for ; Sat, 10 Feb 2024 01:16:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527808; cv=none; b=UYuZ+ZIIcne3lUGZU28Mg6N0s4dosa7N5CT6QEHsd/GuhB17EbSO50CbemO6unKIH3h2/FmiVN32GHA7PcC8BdArTzjLqlZA+DYt8rBJ8ApxZVoLErFgnSLHmxgHn+0bSlgIacI4beqQhKpYU/46h8eEQXMgcfMQtiFiB23L6Q8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527808; c=relaxed/simple; bh=7XJjEgvqeEf1C270MBQlNS8089wSLDXw7au4fhViZ9k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=omam4pYjSS+uaH3JRXtwmXFqvLe3u2etEldPDJmQ2vsBU5LHGUza1b9dsFFxefu/8pAspzL5A63I167yMK2ou50GaMBrckKM44v2lPcitP3kGoGZUijlDeeTNY7vkdrsSlascVSRHRPRQQnbbzF4aoyF3PUkr96lYeojETYiV/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=M8NdWIPI; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2906773c7e9so1090561a91.1 for ; Fri, 09 Feb 2024 17:16:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707527805; x=1708132605; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8mUvX1itSorxxJJ/u/VSZ6UrN6IODCy16GtowaQvelM=; b=M8NdWIPIRQmuR3ktJOzF8F+v8uc3dQaviwFg6/UH28ysFphpayPZH7Rd+fJ2jKaJCB nfaLk3KB6ceySGXz0NCZ5HWs5lm9bJTWLcT2t7rfR+Spk4tFhBFrD6CQ4dodX6IpXW2q miSULLf/BitwVsQsc0sWGHsnkix/fDPsdCdbk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707527805; x=1708132605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8mUvX1itSorxxJJ/u/VSZ6UrN6IODCy16GtowaQvelM=; b=r43Kbn09SkGm07Wf1JaZ2VxIZgQkCrgK5yVSK6LEtmUfsxxQhfi1PAJSYaUWe52rlv 2+mysdJHLOX6MDo45Rw9CmCG5l8PqurT8w3i6+3UxUDx8WseFc8pt+SJ8Dkc2aJa6hSd aLA0cwjdrxRqE91KqnJSfQQMJ284f+AFJubCvzbodcJbaqbSNOKVtxaebp8hJz4LZqi8 R1/V+nc6a0tgkSzZPgPcOeHbIEaZFVneJgJnHMOVuEUCECUGnZDzrRamj4I05u5adfQo SOlgYUe05FY7+vES7cp/HstSJSz8il/Nl0IkcD2DE+Rqr2ZnWLkYK8y7L9hQ1JJfoxgw CaqQ== X-Forwarded-Encrypted: i=1; AJvYcCVx2Zbid/LOnuWqpMWgADdzbryJWthyLMfGH/p4N8erAcIh0sF4Ub1doTpTuM7SIHhBuxDLxXAcPvgyqmmxbcfBjsFuzRlVzPckFgHJ X-Gm-Message-State: AOJu0YxN/4/wViDiYH+6mr3mCmm42Atjx+BK+nQbE6ax9BaIauIMQzQ5 RyYjsk38QEfqHCGnrznQbyWbgJgt69TLL1hFHO9jfwZjOl40klp5DdIoFlg0ww== X-Received: by 2002:a17:90a:eac9:b0:296:e219:eb1c with SMTP id ev9-20020a17090aeac900b00296e219eb1cmr535338pjb.37.1707527805350; Fri, 09 Feb 2024 17:16:45 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXbfrX/vQ+BW17JmTFpCKFM+Wjbut2AMZLVfF/TwhbELBU+Y7ookg2n0ywiZ29PwM0IcVNXt5PB4F0bfr8zLEcJTjtnSFUS0AWU6ANuo9Z5Wtt+FRFxLvHxwXdQIJwAaZjRvDk9Z+RNAy2aAJ3KFhdGgakfHK0VWvSW9g7wnfMWyycqMqHESNUsVPZf/ANwPkZ0sqWJQHb7WW6JN/VfOv0ZpeLyHy8t3oKOxl+42jjjxJStyxbiKkiQMpgtLIWfZ7/ugiTTqCqoVYxSWgWMW4/Kth1JgAl2lnKtkPchsmtuMYwzrnD0l3XLLbRCdeWmkq6FYpuAZ08zEkR3AaHGaQkS7P1qzql60GE2Ul/rpAFOqc0PKfN/i8zg3kOGu9Y0PoUMwHBkEjqhJRPyorJAgsYM2ndATvIa1EOCCf7yQvrxj8HjOG75LEGkh6D2fa5I1F+SfVAYOa8hiHk6cL2LgQQgv9Qc1FwinCp2Z/23025UV911sRN8m9GwqsSY6H0K Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id s21-20020a656915000000b005c662e103a1sm2171623pgq.41.2024.02.09.17.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 17:16:44 -0800 (PST) From: Kees Cook To: Jakub Kicinski Cc: Kees Cook , "David S. Miller" , Eric Dumazet , Paolo Abeni , "Gustavo A. R. Silva" , netdev@vger.kernel.org, linux-hardening@vger.kernel.org, Rasmus Villemoes , Dan Williams , Keith Packard , Miguel Ojeda , Alexey Dobriyan , Dmitry Antipov , Nathan Chancellor , kernel test robot , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net/ipv4: Annotate imsf_slist_flex with __counted_by(imsf_numsrc) Date: Fri, 9 Feb 2024 17:16:42 -0800 Message-Id: <20240210011643.1706285-2-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240210011452.work.985-kees@kernel.org> References: <20240210011452.work.985-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=953; i=keescook@chromium.org; h=from:subject; bh=7XJjEgvqeEf1C270MBQlNS8089wSLDXw7au4fhViZ9k=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlxs56b/YU9uCWyX1kD51B/7AJ32jX6Ko3rsWCD ItxtYxKnueJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZcbOegAKCRCJcvTf3G3A Jri6EACJUceo9gf6zPJCVHzFHPzJ+cKBEOecAQBjsrUQfNTiy7VZT2/P2C19Wsf3zLYOvxTr22Q mIGdvbjFOPTiZ/J4cH1+l2q7zO5PR/zS/5955PGAaCdIzmp5Z2mero036OEvuYfcfiDT+HHmROK J8RgVZDHh405kaxnoIn/Qe5YdrC+0YmuXd/8fj49EHa2fQSvk/ro5hYF+k+kjYsJLNVic9ssfFc X7ch/slGcLT5b3FIBJD+C1BGZQGppSy+Wv4ySmQKtfvuHqLGKvY/sKsUPthayKuilUe3X/SdXSD PPY0X/CHnKa9btW6GjQPWb7Oa3AwSxJnZQZBaMbTZk96bDwPVFar1ztYAFVaYkZpjSWNk6WDJ75 GH9YiiSZQHY8xV14ykgbRnxyZQULRYTdzUXwuEG8ifkLYkzJCW3TmN4kUEuNzL+kiclRLw1zQqL QMOS4yGsVBOu5cK/LGbDWhFbmxBvmNcw7K35YvzL22UXMNQ9tkpMU3gxRpnqbDl9nUhKmSD8LVZ WcSZuv2omy0/5G2EWB8XBrgtdYivyhS4mjqYoBp1edS83dJrRT/78mvm56jlS/t8Twk63QIsCMk 8TFHRHIo+jlikkTi2+AwcWkbzcqCGvARwro7mke7EUP7UAN0FufGN8XIRMC+ehaX2WZ2BNwnYZp CRIiDME9BkAFXig== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790472732237747549 X-GMAIL-MSGID: 1790472732237747549 The size of the imsf_slist_flex member is determined by imsf_numsrc, so annotate it as such. Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: "Gustavo A. R. Silva" Cc: netdev@vger.kernel.org Cc: linux-hardening@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Acked-by: Jakub Kicinski --- include/uapi/linux/in.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h index e682ab628dfa..445f6ae76f1e 100644 --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -199,7 +199,8 @@ struct ip_msfilter { __u32 imsf_numsrc; union { __be32 imsf_slist[1]; - __DECLARE_FLEX_ARRAY(__be32, imsf_slist_flex); + __DECLARE_FLEX_ARRAY_ATTR(__be32, imsf_slist_flex, + __counted_by(imsf_numsrc)); }; };