From nobody Wed Jan 18 17:50:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NxtZN3KyPz2sYTf; Wed, 18 Jan 2023 17:50:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NxtZN2tQ6z3mTD; Wed, 18 Jan 2023 17:50:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674064204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8HBj0laqcaZbo+PMier8lLQDoX7EXR4wqPDZvF4YJAk=; b=SsQFFkdtAI7dIAyvaks7QxnVcrrnAytjv+oSn3XpGp1lkjnHBc2gglAYNuIRWOVDv3oO1Q u/MYtzFveRMjU/zvrne39tXhUKGQS23EurwBmQXTOKOCFJtre6Po4BkZAbgwdk/LDqN141 t/vnmL2YT7MhtHzmciO6XmBrryaqrwKL2H/eGZvSineY/cOOXEgHNCNZzzQxF7K1HK3sLn 9YDZghiz/AfbNNJnxsCwWPuQkfz6OHM/xSHnWlw3ataigsc3i5dZvF/MasvFu4TGT4p9YW 3RulBxWO6mqI0mg9UmMX0jh4UAaZWh4fR2p5PMvvqLXSnpI6oFgUgR13wBR9Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674064204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8HBj0laqcaZbo+PMier8lLQDoX7EXR4wqPDZvF4YJAk=; b=rI5z0BPc4dEqx58rwjtLzs+1MEcZscTQFr7iHzteyhJal1vAH63jPv9nzs68nGORH+ya5E 6LU6pmhSvcc5csxWKmr0vhKDpHgeIG9H9k0YHiEbOYdOWddnpu4/wuI2RcSf50PjJVhUx1 dWxlFJEc5fkJ7/FOf87hEWis0/3ojLJU7cnzO+0Z02+crCMDTy/7va1tdRX6daMO4ZOPvo wGJ3nqxWffo6XqyojxOU09uMTcfr2NGknYKdw3e1jLUU1WIN5iFT68O/FghUiJ0Nk1r9Q7 jPqchFH2/OoTJag3KXP+9z9pEjGwBwNofgWpe+AI4J5RKsfYazJqiROT+reARQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674064204; a=rsa-sha256; cv=none; b=ZnLPi8UvYY3AQkhyEr7OrLh7lTcwwu8X/wle9FeVBnbpT74n0eXCkI07+5O60nXevXq1Aw +BvCFwdDjj1rayX/RzPSD5lW2psWTmTJ7C01MStstEW73h8ynmxfYNPhVT6wRAXv/CZI5m +dfSZ56Py/oWaqIIl0WWHZXmqrZ8aXcnzNSEecZvXIAtXtiTalmLYvY5UDseiJEo7sib27 CrJ1akbscmaLqjS6e3k1VoOl1BVtIT4oShDc0LYjxKNcNCxFeny54sU99/0COA5SOGvVmT Alsspm/7cYDvPOv/66FUPTBflR3h120nuhaT3685Zh5HiQmpldvJV2aNdvqUkw== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NxtZM5jJ2zNXJ; Wed, 18 Jan 2023 17:50:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 18 Jan 2023 09:50:02 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US To: Hans Petter Selasky , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202301131019.30DAJXWf081968@gitrepo.freebsd.org> From: John Baldwin Subject: Re: git: e0d8add4af0b - main - tcp_lro: Fix for undefined behaviour. In-Reply-To: <202301131019.30DAJXWf081968@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 1/13/23 2:19 AM, Hans Petter Selasky wrote: > The branch main has been updated by hselasky: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e0d8add4af0be1d37ede9a16f46424dc08f0d95e > > commit e0d8add4af0be1d37ede9a16f46424dc08f0d95e > Author: Hans Petter Selasky > AuthorDate: 2022-11-28 22:56:16 +0000 > Commit: Hans Petter Selasky > CommitDate: 2023-01-13 10:18:19 +0000 > > tcp_lro: Fix for undefined behaviour. > > Make sure the size of the raw[] array in the lro_address union is > correctly set at compile time, so that static code analysis tools > do not report undefined behaviour. > > MFC after: 1 week > Sponsored by: NVIDIA Networking > --- > sys/netinet/tcp_lro.h | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h > index 427657df47e7..e01e451c1e77 100644 > --- a/sys/netinet/tcp_lro.h > +++ b/sys/netinet/tcp_lro.h > @@ -34,6 +34,8 @@ > #define _TCP_LRO_H_ > > #include > +#include param.h should always be the first header, and it also sorts before time.h. > + > #include > > #ifndef TCP_LRO_ENTRIES > @@ -65,8 +67,12 @@ > > struct inpcb; > > +/* Precompute the LRO_RAW_ADDRESS_MAX value: */ > +#define LRO_RAW_ADDRESS_MAX \ > + howmany(12 + 2 * sizeof(struct in6_addr), sizeof(u_long)) > + > union lro_address { > - u_long raw[1]; > + u_long raw[LRO_RAW_ADDRESS_MAX]; In OFED this anti-pattern uses 'u_long raw[0]' which I think is probably at least better than '[1]'. My worry is that LRO_RAW_ADDRESS_MAX is fairly fragile and gross, though the static assertion at least catches if it is wrong. In general though for both OFED and this, I think is is actually cleaner to remove the weird aliasing 'raw' member and just use a plain (u_long *) cast. If you did that, you could revert this commit and have the simpler definition of LRO_RAW_ADDRESS_MAX derived from the sizeof() the type. -- John Baldwin