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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 223383858D35 for ; Fri, 10 Dec 2021 11:53:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 223383858D35 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-432-R60R2I5HNs-S-ca3dY8VLw-1; Fri, 10 Dec 2021 06:53:25 -0500 X-MC-Unique: R60R2I5HNs-S-ca3dY8VLw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFAD11018720; Fri, 10 Dec 2021 11:53:24 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.193.123]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E69F55C23A; Fri, 10 Dec 2021 11:53:23 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella via Libc-alpha Subject: Re: [PATCH v2 2/2] linux: Fix ancillary 64-bit time timestamp conversion (BZ #28349, BZ #28350) References: <20210929140619.279302-1-adhemerval.zanella@linaro.org> <20210929140619.279302-2-adhemerval.zanella@linaro.org> Date: Fri, 10 Dec 2021 12:53:21 +0100 In-Reply-To: <20210929140619.279302-2-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Wed, 29 Sep 2021 11:06:19 -0300") Message-ID: <878rwsbrri.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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.5 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_H2, 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: Fri, 10 Dec 2021 11:53:30 -0000 * Adhemerval Zanella via Libc-alpha: > diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c > index 00c934c413..5ee930035b 100644 > --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c > +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c > @@ -54,26 +54,26 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) > cmsg != NULL; > cmsg = CMSG_NXTHDR (msg, cmsg)) > { > + if (cmsg->cmsg_level == SOL_SOCKET) > { > + switch (cmsg->cmsg_type) > + { > + case COMPAT_SO_TIMESTAMP_OLD: > + if (type != 0) > + break; > + type = COMPAT_SO_TIMESTAMP_NEW; > + goto common; > + > + case COMPAT_SO_TIMESTAMPNS_OLD: > + type = COMPAT_SO_TIMESTAMPNS_NEW; > + > + /* fallthrough */ > + common: > + memcpy (tmp, CMSG_DATA (cmsg), sizeof (tmp)); > + tvts[0] = tmp[0]; > + tvts[1] = tmp[1]; > + break; > + } > } > > last = cmsg; } if (last == NULL || type == 0) return; if (CMSG_SPACE (sizeof tvts) > msgsize - msg->msg_controllen) { msg->msg_flags |= MSG_CTRUNC; return; > } > > msg->msg_controllen += CMSG_SPACE (sizeof tvts); > + cmsg = CMSG_NXTHDR (msg, last); > if (cmsg == NULL) > return; > cmsg->cmsg_level = SOL_SOCKET; How can cmsg be NULL at the final if? We always iterate until we have cmsg == NULL, so CMSG_NXTHDR (msg, last) should be NULL? Thanks, Florian