From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 8041A383D015 for ; Mon, 5 Jul 2021 19:07:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8041A383D015 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-5B5J3DZENvuXLs9LJj52cw-1; Mon, 05 Jul 2021 15:07:58 -0400 X-MC-Unique: 5B5J3DZENvuXLs9LJj52cw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06B0319057A0; Mon, 5 Jul 2021 19:07:57 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-5.ams2.redhat.com [10.36.115.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 308AF179E6; Mon, 5 Jul 2021 19:07:55 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella via Libc-alpha Subject: Re: [PATCH 4/7] linux: Fix setsockopt fallback References: <20210705183027.3804093-1-adhemerval.zanella@linaro.org> <20210705183027.3804093-5-adhemerval.zanella@linaro.org> Date: Mon, 05 Jul 2021 21:07:54 +0200 In-Reply-To: <20210705183027.3804093-5-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Mon, 5 Jul 2021 15:30:24 -0300") Message-ID: <87lf6kk29h.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jul 2021 19:08:00 -0000 * Adhemerval Zanella via Libc-alpha: > The final 2 arguments for SO_TIMESTAMP/SO_TIMESTAMPNS are being set > wrongly. > > Checked on x86_64-linux-gnu and i686-linux-gnu. > --- > sysdeps/unix/sysv/linux/setsockopt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c > index a4780a9d33..fae7305c9d 100644 > --- a/sysdeps/unix/sysv/linux/setsockopt.c > +++ b/sysdeps/unix/sysv/linux/setsockopt.c > @@ -78,7 +78,7 @@ setsockopt32 (int fd, int level, int optname, const void *optval, > optname = COMPAT_SO_TIMESTAMP_OLD; > if (optname == COMPAT_SO_TIMESTAMPNS_NEW) > optname = COMPAT_SO_TIMESTAMPNS_OLD; > - r = setsockopt_syscall (fd, level, optname, NULL, 0); > + r = setsockopt_syscall (fd, level, optname, optval, len); > } > break; > } Maybe add a comment that the recvmsg code does conversation, so the old socket option is also acceptable? The patch itself looks okay to me. Thanks, Florian