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: 13552026 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) (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 30A0A2119 for ; Sat, 10 Feb 2024 01:16:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527810; cv=none; b=fZX8s54JdmSd/TPq/nogkyqajTX4xW8DyHbbMM61zVsd9qxa0rY2vk4oN0zkUE2CrIvApF1MWmdahQlaiO3e2HXB3pT0KJUO2Yod5wE4i2SO591IlGf5tggOgCtXoF9BZFt589B7fngakggX/6oEZBG/Dpf29l78zHSuFcEiAHA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527810; c=relaxed/simple; bh=UIYu98yTnq6IoG7p77xS2jBpkcg5lQjLVhPitCGvuaQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=A/DwDz7i20e8MG0GdRWZPGvei+dWFh4noipFKu3RTIELSF9ZmkapWN+h4maFq5aKmmo1m0nzhuXLKAQL1TyHRimpSeTuuuip4roEu93fqos81632VN/xLTdihfuMxzIHa0KzunpirqMZqwyGulHy4s8clQ9qoHW7QOfxMTTxFYw= 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.167.176 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="aV2T8cIw" Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3bd4e6a7cb0so1016588b6e.3 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=nhbmo06nRgeWdqPXcSG4h1ZfdEjBjXTyRbNahUEE/yKqDgCK5xh4i/TAUzFZmB8eaR 8xKYz4JJtFdSl8Gw58e+66ha5kQBEW0PN0cudPDvvaqddCA1XgbJKT/81x6aiRGkLGoN 89w9hte3Fl2HbUjAu5mubSagX1rb/nmS4K2NCCaz2hulhhP86b6+9+fSNDvkbp0XQY5c zk1IyE/WmTZMQq8Icpps35qkZI5CFeVcTdwDUP6vTUzm8PTN47oTvT7xadmOpQKPBNIu gmJZlqFvmEHZQ56F/jT6hU+PB9YOPTGjphSjrZfoMh3hwFvCPGPxhcNDZ+KXakINJvjx Uk5Q== X-Forwarded-Encrypted: i=1; AJvYcCVhKzO1IydDrwvLjtzLlSzyEloZJJr97ouPM1qDQkNy1IMYNKXeQDKYHj8h4Fhe4Lre/lPASLRl0Q+a1f6u+/z3SOliBmPi1T+qHzMeA4L1 X-Gm-Message-State: AOJu0Ywg6YWP2joSNZUKI9p4RmvNOhIjXy5TdOFM1fXgZLHS97ZBmpBz bt3KFL9+cgKgimUt24dstoUqpjuzkSyl8dQxg9VtClevChSu2DxlfWjmxk2zCQ== X-Google-Smtp-Source: AGHT+IEKi1eEOSwMW3MpZVRb38CcWUA4s3Gb7uYAM3HsK8HkoIO5prwyulds2tpc/QtITjI/gewPkQ== 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-hardening@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 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: 13552025 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 7E65B1FD1 for ; Sat, 10 Feb 2024 01:16:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707527808; cv=none; b=pQOm5yQgrMa9VWXwxU44owlo9TfTHsS1bOD3iFYerRnn9+vqP7J9yHwLGgjpQvc4cevBqCH9QD043YR2rTXiOY9IzmELp519pSFv8AtVjder0r5s4BNTieGdoTFnHq8bS7gkZCaiRBAsjLul5jqpDKqZNxCdBD0Svj7WeAs2Jho= 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.52 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="M8NdWIPI" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-290da27f597so1084138a91.2 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=ho7Ov/Jlq3bsWASb0pQNG6AJVSBJUrW5J2zr+wFItihG92h61gFEJsrjabWPzQ56ak PubR7BP0lcYgnSXw3LOeTdaSZ30N/jt1cloUjXJLl7sSBu1jyfbmObhSQqNHJIIDVvH/ Z3HFpvKA99f+ZOyxjd1MUrpriV5nDY2G50UZdcAafwG2WyzaK2vONSrxyeNgQI6N/hKA bqE411PlwhWmP+73PeA3pGFQMrCm3FK2fJRJ3rxfMfuzW8qv42MDasYuORyLjbaRwF0e T5yGnl6BoQb7y5UrNifcvs/g4vwTSpLsNS+anqBpXTs6sRWgm+e0HFCUITG7NfhTRGq6 VLIA== X-Forwarded-Encrypted: i=1; AJvYcCV7WTirvrb4RXyomLQDy+eNLczcG3V2NztnvSg5qcVjCjzJupO7M2NZc5gIW2EfqW0ke8kuLQV2eOqQOLg4Xi3O9SGEDnQzD2K4D1hXpDoY X-Gm-Message-State: AOJu0YxRqmujJZf5iaAYoqwva5cOOZ0AakwdL/rRut+xUyCzjpmeD9jg rGPloH4r5f0PMXHk1yP4KkGVMf67B5P5xVP4qMS11WO8EAwlZ+y5+I6I+jj3fA== X-Google-Smtp-Source: AGHT+IH6tbwWdPxhsZFHudRBZ6pJTFjSN4L0eEKXiYI/GL4yI3y+V2ANH7bQZbSma+RQT7XTv+6W6w== 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-hardening@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 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)); }; };