From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id ED6CA1F4B4 for ; Fri, 2 Oct 2020 17:10:30 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 26E18398E479; Fri, 2 Oct 2020 17:10:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26E18398E479 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601658630; bh=nY0JgbYTBT6yN4JQbARnDN/k5GwODfO0MEa47Z4N8jo=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UtCSJDXjZPQT7DHlExJ2Yg/3pp+mXZ7VUfITkfRJdJk/yQxQQDc3Rnjq5z4v2tIyt OUAvO7kdz/0640UDOXGtR75B9vfZ6OweKeL7MVAzeZ6QsWl1k9jgcQH6SlCEcstHAy iQmMESZhTRP4wV1uXPJHItQ9qCc0e6o7Cajsloic= Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 85487383F86C for ; Fri, 2 Oct 2020 17:10:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 85487383F86C Received: by mail-qk1-x744.google.com with SMTP id f142so2080570qke.13 for ; Fri, 02 Oct 2020 10:10:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=nY0JgbYTBT6yN4JQbARnDN/k5GwODfO0MEa47Z4N8jo=; b=qeevxghJ22HyfQnBGjdPmK85vWjbGh/sUgW1Iy+Rf4p2i+uQwCObD+eXwuwyM/1/tY j7ragg6VTv2qEfzfevMoOWu2m8+RDKEFzuGe4deKbfJyqwMemjDhWIXoHteRG7GbOKWe 7JQzz35Piwb8JD9LZb36UNLHXWt7GVxEFtLP4e4uV2T7uo4PH4ypZee4wse/C/BJnPLb f5QG1v7PM9pf2yo0boA8xMWNDxKXxvsBDE1b7Jnsf29XXiIKxH+pNDWgZIjhGrotrUHF uzcpOEpSOjOXdk+576KBWXCL+tYGrV5AogxqAcOfy+rV9PmuA2GBj6cJ/57kbNbW3Am4 gebA== X-Gm-Message-State: AOAM530CeeOMZl5eJ3ubqAnfHWswGhscMrNWPpkkt8NTgRFZumAFmcw/ DeRLkb1LbPfPuAy6b4q/uhsZqgaVoO1c0Q== X-Google-Smtp-Source: ABdhPJwpVCBWZUtFZkH9boEFXaPsrnGy2mvr6N3RoxHzKyWvStOStz2kn6W7mvovqgXfb0X5YOxm5w== X-Received: by 2002:a37:a414:: with SMTP id n20mr3119992qke.332.1601658626582; Fri, 02 Oct 2020 10:10:26 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id q6sm1430804qkc.85.2020.10.02.10.10.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Oct 2020 10:10:26 -0700 (PDT) Subject: Re: [PATCH 2/3] Linux: unlockpt needs to fail with EINVAL, not ENOTTY (bug 26053) To: Florian Weimer , libc-alpha@sourceware.org References: <102eb945daf454cce7c0dbd499ce3db1ebb734cd.1590574208.git.fweimer@redhat.com> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <16c0c024-b97e-1316-907c-6ca81a19fce3@linaro.org> Date: Fri, 2 Oct 2020 14:10:23 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <102eb945daf454cce7c0dbd499ce3db1ebb734cd.1590574208.git.fweimer@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On 27/05/2020 07:14, Florian Weimer via Libc-alpha wrote: > The EINVAL error code is mandated by POSIX and documented in the > manual. Also clean up the unlockpt implementation a bit, assuming > that TIOCSPTLCK is always defined. > > Enhance login/tst-grantpt to cover unlockpt corner cases. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > login/tst-grantpt.c | 20 ++++++++++++++++---- > sysdeps/unix/sysv/linux/unlockpt.c | 21 +++++---------------- > 2 files changed, 21 insertions(+), 20 deletions(-) > > diff --git a/login/tst-grantpt.c b/login/tst-grantpt.c > index 1d7a220fcf..8ca901ef94 100644 > --- a/login/tst-grantpt.c > +++ b/login/tst-grantpt.c > @@ -1,4 +1,4 @@ > -/* Test for grantpt error corner cases. > +/* Test for grantpt, unlockpt error corner cases. > Copyright (C) 2001-2020 Free Software Foundation, Inc. > This file is part of the GNU C Library. > > @@ -28,7 +28,7 @@ > #include > #include > > -/* Test grantpt with a closed descriptor. */ > +/* Test grantpt, unlockpt with a closed descriptor. */ > static void > test_ebadf (void) > { > @@ -48,9 +48,12 @@ test_ebadf (void) > printf ("grantpt(): expected: return = %d, errno = %d\n", -1, EBADF); > printf (" got: return = %d, errno = %d\n", ret, err); > } > + > + TEST_COMPARE (unlockpt (fd), -1); > + TEST_COMPARE (errno, EBADF); > } > Ok. > -/* Test grantpt on a regular file. */ > +/* Test grantpt, unlockpt on a regular file. */ > static void > test_einval (void) > { > @@ -68,10 +71,13 @@ test_einval (void) > printf (" got: return = %d, errno = %d\n", ret, err); > } > > + TEST_COMPARE (unlockpt (fd), -1); > + TEST_COMPARE (errno, EINVAL); > + > xclose (fd); > } > Ok. > -/* Test grantpt on a non-ptmx pseudo-terminal. */ > +/* Test grantpt, unlockpt on a non-ptmx pseudo-terminal. */ > static void > test_not_ptmx (void) > { > @@ -80,6 +86,9 @@ test_not_ptmx (void) > TEST_COMPARE (grantpt (ptmx), 0); > TEST_COMPARE (unlockpt (ptmx), 0); > > + /* A second unlock succeeds as well. */ > + TEST_COMPARE (unlockpt (ptmx), 0); > + > const char *name = ptsname (ptmx); > TEST_VERIFY_EXIT (name != NULL); > int pts = open (name, O_RDWR | O_NOCTTY); > @@ -88,6 +97,9 @@ test_not_ptmx (void) > TEST_COMPARE (grantpt (pts), -1); > TEST_COMPARE (errno, EINVAL); > > + TEST_COMPARE (unlockpt (pts), -1); > + TEST_COMPARE (errno, EINVAL); > + > xclose (pts); > xclose (ptmx); > } Ok. > diff --git a/sysdeps/unix/sysv/linux/unlockpt.c b/sysdeps/unix/sysv/linux/unlockpt.c > index 3a0ac7a96c..4d98abece0 100644 > --- a/sysdeps/unix/sysv/linux/unlockpt.c > +++ b/sysdeps/unix/sysv/linux/unlockpt.c > @@ -27,22 +27,11 @@ > int > unlockpt (int fd) > { > -#ifdef TIOCSPTLCK > - int save_errno = errno; > int unlock = 0; > > - if (__ioctl (fd, TIOCSPTLCK, &unlock)) > - { > - if (errno == EINVAL) > - { > - __set_errno (save_errno); > - return 0; > - } > - else > - return -1; > - } > -#endif > - /* If we have no TIOCSPTLCK ioctl, all slave pseudo terminals are > - unlocked by default. */ > - return 0; > + int ret = __ioctl (fd, TIOCSPTLCK, &unlock); > + if (ret != 0 && errno == ENOTTY) > + /* POSIX mandates EINVAL for non-ptmx descriptors. */ > + __set_errno (EINVAL); > + return ret; > } > Ok.