From patchwork Mon Jul 5 18:30:24 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: 44158 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 A26E2383F43B for ; Mon, 5 Jul 2021 18:34:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A26E2383F43B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625510042; bh=1l5dexN4Z2QL0l6VfWwezxj0WzvZBFAw1MYl/+/P12c=; 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=ZFJV6LxTKVhuTnlDHLPDOq+PoyIm2MFuC8xbFujCDi7s7LiR4IuHZcCvMMaTnMKDW 1ElLQfqPNUrOSzNMOXNrwkLPf17RdhSt/lPgEQeNeQFhe3poPFxWxFSci/MC4Jotw4 6J2TfV7ivCrk4XrHUoB+ZhA1LuHrDaYBT5+merts= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id CB7B5383F415 for ; Mon, 5 Jul 2021 18:30:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB7B5383F415 Received: by mail-pj1-x1031.google.com with SMTP id p17-20020a17090b0111b02901723ab8d11fso420701pjz.1 for ; Mon, 05 Jul 2021 11:30:38 -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=1l5dexN4Z2QL0l6VfWwezxj0WzvZBFAw1MYl/+/P12c=; b=S1PKTbZNsOtqRVRWE+1KKgZbUUol2VzFhKXDiSjupACjdBH+naTsuOjbfG3FB31KAe xOcqXUi8iEZyiHyoHbay2YE5GrxP/Ezo4KAOyp4bEvDIwbZMEVnyWQaNs0YOYLXeqzAb bCpqrnDHunNL++OnHALklhIcE/45L860Z6HLAIEpYwe7ZHFEXKN/JJuu/pjMoVjz2iKC x5IwnS/Md7DJ4GAtAIJ59KR6yJlD7qbzhvBiR9HBi7iWHa6gw67MTscMrG9wxWsTrVET p5c35CT8fO1X2jXnj+QwapG1EPy5Rc5IWMNTADfowVl5OxmOfX/41XHSKG/ZaM2PLxXV JoIQ== X-Gm-Message-State: AOAM5312QJQEAlFyrpRY6B8aaur3fec4ao8zaPniVHxnR26uX2np/NPC 3oxcON7f3bRSR98SKCNLDikCmkpchFXvfg== X-Google-Smtp-Source: ABdhPJx0pP7hhRgAWniQE0rP8ym0E/AQru+qrQg9lqLRPhtgeHXuA9Akkyb45wQDwZhSBzUplmpnfQ== X-Received: by 2002:a17:90b:430f:: with SMTP id ih15mr411012pjb.56.1625509837798; Mon, 05 Jul 2021 11:30:37 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.gmail.com with ESMTPSA id y13sm14311299pgp.16.2021.07.05.11.30.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jul 2021 11:30:37 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 4/7] linux: Fix setsockopt fallback Date: Mon, 5 Jul 2021 15:30:24 -0300 Message-Id: <20210705183027.3804093-5-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" 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; }