Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <49b0d7bd-2bc1-c994-7780-35554a399242@intel.com>
Date:   Fri, 4 Aug 2023 17:42:19 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH net-next 1/3] virtchnl: fix fake 1-elem arrays in structs
 allocated as `nents + 1` - 1
To:     Kees Cook <keescook@chromium.org>
CC:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Larysa Zaremba <larysa.zaremba@intel.com>,
        "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
        "Gustavo A. R. Silva" <gustavoars@kernel.org>,
        <netdev@vger.kernel.org>, <linux-hardening@vger.kernel.org>,
        <intel-wired-lan@lists.osuosl.org>, <linux-kernel@vger.kernel.org>
References: <20230728155207.10042-1-aleksander.lobakin@intel.com>
 <20230728155207.10042-2-aleksander.lobakin@intel.com>
 <202308040126.ADDA993@keescook>
Content-Language: en-US
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <202308040126.ADDA993@keescook>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZlpsVEhyS1ZRSGxBNW1ud1FaZENCZ0FtMDlhc1RLUmh6Wk5ENXdDTmlSL3hq?=
 =?utf-8?B?d08xUkJhMmVjemdob3ByelZBRysyZmlROU1HRGE0aWlYOGJkUEtaa0F3SUZu?=
 =?utf-8?B?QURNak9rQ2RUTkY2aGlDN3prUkYvZ1hrdWw0SGtpT2MxTnZZL1lzQ1Bhbzhv?=
 =?utf-8?B?MDIvOUxob2lzaUhueHErZFZPZHBxbGNWcUxBMUh3TkRpSWUrMyszMmZiaEdU?=
 =?utf-8?B?ZWpMVElCMllRSWMyL05EZ3RSYnRuUWFUNHJOdnRsVS9mUGZjL2gvbWp1QnZZ?=
 =?utf-8?B?QmdObmU3YUxqeGx6RDgrOUU3eTMrS3FzaFdxREhHYjdoay9FS1Y0OElVWTVs?=
 =?utf-8?B?UHMydVQ5OVhOWTJFOFEzeEY3aDI1dlNjS2RKVU51K0lhUzRYeVAvTkd2MU9w?=
 =?utf-8?B?R21hb1haanNUTWxTN3BpakQxcDJKQ0FCYVlTUnk2MjU2Ynd5TWZqckVrOURE?=
 =?utf-8?B?amh0cHZqWnozTnpQcFFtT0QycmVwdWlwaW5EK0VubmJSbHdCMFVod0hxdlZs?=
 =?utf-8?B?c1BsUXZqUFRubDVhdjF4SEI1T0F5Mk5KbUV4dkhiOVFmTFlPUFRDZm8xalRQ?=
 =?utf-8?B?a1huOW9XeG9JZ1FVdFlPV3BVQzR0YTFVOVB5eGlxUDJFdEZCa0I3TUJNdnA2?=
 =?utf-8?B?bUFrbU5EZTVwcmZCQUpEdm1LdTVCZ3l2aERPM0JtNXowdldqQVloUTErcEJI?=
 =?utf-8?B?L3Qzak9QVHpYclRMbVgyZkh1VEpwTERtMGxFOW9vemhNSWZPbS9IbmpGUGpY?=
 =?utf-8?B?aFdweFVLTi9NUjZLVFF6QVRySjgwNW83dFUwMkJxT1AzcUY5TWtzQk9HaEto?=
 =?utf-8?B?dDFKcTE3VzQrcmd3bmZma3VzMzF4a2h5TllpWmlRcXB1anBJeFdiU1FaSGNU?=
 =?utf-8?B?c2NXL2ZUVG9FL2VOMHBEQ2ZKTmdieEI2SGdYb05zQWRyTXBPb1RSTnJpNXAw?=
 =?utf-8?B?WURLdXVwTjlQdkE5RDNkR3lFVnFpMzFpclExMEo1QXg1b2dVMmRHL29lZDFB?=
 =?utf-8?B?MW5TaUEwSDhORmgyL1MzdXNMeXlXWitvczl5YmRBWGU5dTJ2bGNOQVBNQzYx?=
 =?utf-8?B?ejJQNVlHaklQcEcwT2hMSGNzK0xtbk9CMXZHcHBFY1FINkl0VGg4dmg3Ny9o?=
 =?utf-8?B?SVlmczYyTU9MNmcwQmxMZnQ5TC9ZZUZHZlFTYTVYcDJhWUZPKzBML0VyQ0tG?=
 =?utf-8?B?YlkvSkNTSUJyd2xQMHhYUTkzZlAweGdra1dJbkxQcEtyVGRTbldveXVzNHhE?=
 =?utf-8?B?UGVUL3FlSWFmOW5QTGdJNlIyUEQ5THdYR1FUZm9OTFFWWThDK2k2d01rT05V?=
 =?utf-8?B?WldtekhOWWgySjRROFAxTGk2REFSNE1XNmhtenZGa3QyMitCTXpvcDdpZVla?=
 =?utf-8?B?TFZmVW5kRlMyNzZXN282ZzZzRlhtSU1pcVNaNlFwTWRENmRHdDZLN3hKQzho?=
 =?utf-8?B?ZDlyTjBBYUVjczhFdG9DUUJwQXBaejRWMkRZd2d6eGlsSnZ3MlJhN1ZWTWJl?=
 =?utf-8?B?eHBENGNWUEFrU0tHaGV4eVl6YUQzUHNzK0FVNXUzT0drZUVoQ2Z0VEtnWGNa?=
 =?utf-8?B?Q0w5aWtFZHlBcEplU3ZHYlRmTVBVYTVBYzMzZDBGYUlENW9xZVZESm40Y0th?=
 =?utf-8?B?RE1JSmc1anFCN2U2VGZFRk1qN01DVTZQclU2NmRQODdMMFJDVTdyN0MrbmZy?=
 =?utf-8?B?eHdXVmVPWjBsTUxBaVJUbnAxTWNtSjlnVTRlczBwZWxLbnFkVzRLSzYzU20y?=
 =?utf-8?B?NGNCVlVuQ0dTWEpqVTcxZWYrakFKeHhYTmZzNnFuNXdSSm9yd28rOFphdFZl?=
 =?utf-8?B?azF2eUgyQkRrQVhjYnZTTDZUVHBLdXJzRWRsZXl0TlRKRi9tWWpTLzZrUUUy?=
 =?utf-8?B?eFpTZ1FyZFZwb1B1b3VMb1BrUGhQMEdrYm9jMTZBb0JIQWR1N2F2amhGVWNF?=
 =?utf-8?B?OHdTdy9Cb0VWd0pJNFVsMnRBdGlrRlQwamk1MStpTllVcjlZTlBhaXV3TmFv?=
 =?utf-8?B?cEdBbzZySVFHQ09KWHJGK2dpSm1wcndPOFBTYzl3VnlRRnlVV1VSRFcvMTBO?=
 =?utf-8?B?RUlPYjd2aVJRb1pkWXFLdjBpUWd6TTZRK3NBS0xabEJJOURxWFdleTNBZExL?=
 =?utf-8?B?MVoyaUM3TTQ5dEJUVW9VdC9pSEVubVY5a0pjd2xCY01xbFh0b2lEcEpTdlNi?=
 =?utf-8?B?L0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7c7eb0f9-7f6b-4cc2-c7bc-08db9501675f
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2023 15:42:26.8005
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4htYhx3jv1n4H+HKcZ7iIXkAiAY5tpFeA2fRtVXRMHBxILMJw8r+MHwQbAJdQrebpjpVcLudTOJyrXvIKIiE6H9c3MS/lhVbYNT90q2fRGA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5537
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Kees Cook <keescook@chromium.org>
Date: Fri, 4 Aug 2023 01:27:02 -0700

> On Fri, Jul 28, 2023 at 05:52:05PM +0200, Alexander Lobakin wrote:
>> The two most problematic virtchnl structures are virtchnl_rss_key and
>> virtchnl_rss_lut. Their "flex" arrays have the type of u8, thus, when
>> allocating / checking, the actual size is calculated as `sizeof +
>> nents - 1 byte`. But their sizeof() is not 1 byte larger than the size
>> of such structure with proper flex array, it's two bytes larger due to
>> the padding. That said, their size is always 1 byte larger unless
>> there are no tail elements -- then it's +2 bytes.
>> Add virtchnl_struct_size() macro which will handle this case (and later
>> other cases as well). Make its calling conv the same as we call
>> struct_size() to allow it to be drop-in, even though it's unlikely to
>> become possible to switch to generic API. The macro will calculate a
>> proper size of a structure with a flex array at the end, so that it
>> becomes transparent for the compilers, but add the difference from the
>> old values, so that the real size of sorta-ABI-messages doesn't change.
>> Use it on the allocation side in IAVF and the receiving side (defined
>> as static inline in virtchnl.h) for the mentioned two structures.
>>
>> Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
> 
> This is a novel approach to solving the ABI issues for a 1-elem
> conversion, but I have been convinced it's a workable approach here. :)
> Thanks for doing this conversion!
> 
> Reviewed-by: Kees Cook <keescook@chromium.org>
> 

Thanks a lot!
You gave Reviewed-by for patches #1 and #3, does it mean the whole
series or something is wrong with the patch #2? :D

Thanks,
Olek