From patchwork Mon Jul 5 18:30:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 44157 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2DADA383D809 for ; Mon, 5 Jul 2021 18:33:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2DADA383D809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625509998; bh=M959oLHOsWUnb+QZaQhzbtvyYoqosgBDi0yHHfJeh1E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fhPX2co2css9MWhxJacC4KyB0FJLE6GeuoHzu2BnVX1g3kJBkeyITByajBJ8xw6Nj YJDmCH/ysH+HEVxWsT/pG4/4aElO7ILWWiGvXLnvbgMxgB/5e9lm6RUjod1apoTaiz VkH6ZD0WsXI84ExncZ0hYMHqnB5a55x2h1UtAr8Q= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by sourceware.org (Postfix) with ESMTPS id 7B1263853804 for ; Mon, 5 Jul 2021 18:30:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7B1263853804 Received: by mail-pg1-x536.google.com with SMTP id o18so18409187pgu.10 for ; Mon, 05 Jul 2021 11:30:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M959oLHOsWUnb+QZaQhzbtvyYoqosgBDi0yHHfJeh1E=; b=MEBkUJdE/bRznqFw5LQrEC1g1zPm9MgNaF7He9CA+Une7/ItzcG26yUstFkkgVR5PQ JCreaxGaTj9bn3LKdHlSohZoSlzwY1pH0znZl417deFohL8l/OqbVrYQ/ZKxKkW93sfE lFi9DcvCUjP5Z5PDUW2WMNQfzRc3GaO8a8KeBUn+mW2SdR+aWJZICiCEew9sgET4wUiZ SuUKAc1oOE9iz/51z2sEMozFpPmNlJljHtVk3gED6T9AWQ9yGaXq6PNtOlP5IRpc31qx Sx+40aCYCTt5lVibboIvn17Wju37I7HLsA3xfmVk8y6cPMh3fmDJ3PeIKRFNexucdZq3 qkIg== X-Gm-Message-State: AOAM533DYaAlCvRWDoYQKXA3P/VsM7mP5fY4Y2T02iYRQvbNWrR34qd2 f9ohHtiF3CxN2z8qLLJ0IMiE0oE59jo4LA== X-Google-Smtp-Source: ABdhPJyY+pMxmiI6fQsikfWtOLGT03/PBmX+9soihr8dGJQGld3dUQ2Jnrh+y3WlQKxihaYKMFP+RA== X-Received: by 2002:a05:6a00:9a5:b029:30d:fad7:4515 with SMTP id u37-20020a056a0009a5b029030dfad74515mr16582719pfg.28.1625509836498; Mon, 05 Jul 2021 11:30:36 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.gmail.com with ESMTPSA id y13sm14311299pgp.16.2021.07.05.11.30.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jul 2021 11:30:36 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 3/7] linux: Use the expected size for SO_TIMESTAMP{NS} convertion Date: Mon, 5 Jul 2021 15:30:23 -0300 Message-Id: <20210705183027.3804093-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705183027.3804093-1-adhemerval.zanella@linaro.org> References: <20210705183027.3804093-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Kernel returns 32-bit values for COMPAT_SO_TIMESTAMP{NS}_OLD, no 64-bit ones. Checked on x86_64-linux-gnu and i686-linux-gnu. --- sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c index 5af71847f5..2db5750f50 100644 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c @@ -44,7 +44,8 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) 'struct __kernel_sock_timeval' while for SO_TIMESTAMPNS_NEW is a 'struct __kernel_timespec'. In either case it is two uint64_t members. */ - uint64_t tvts[2]; + int64_t tvts[2]; + int32_t tmp; struct cmsghdr *cmsg, *last = NULL; int type = 0; @@ -69,7 +70,10 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) /* fallthrough */ common: - memcpy (tvts, CMSG_DATA (cmsg), sizeof (tvts)); + memcpy (&tmp, CMSG_DATA (cmsg), sizeof (tmp)); + tvts[0] = tmp; + memcpy (&tmp, CMSG_DATA (cmsg) + sizeof (tmp), sizeof (tmp)); + tvts[1] = tmp; break; }