From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22651 invoked by alias); 5 Dec 2019 16:30:45 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 16120 invoked by uid 9299); 5 Dec 2019 16:30:27 -0000 Date: Thu, 05 Dec 2019 16:30:00 -0000 Message-ID: <20191205163027.16119.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.30/master] misc/test-errno-linux: Handle EINVAL from quotactl X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.30/master X-Git-Oldrev: 4719e1851cd1101e555f314497504a54ba3fb99a X-Git-Newrev: 50f20fe506abb8853641006a7b90a81af21d7b91 X-SW-Source: 2019-q4/txt/msg00545.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=50f20fe506abb8853641006a7b90a81af21d7b91 commit 50f20fe506abb8853641006a7b90a81af21d7b91 Author: Florian Weimer Date: Thu Dec 5 17:29:42 2019 +0100 misc/test-errno-linux: Handle EINVAL from quotactl In commit 3dd4d40b420846dd35869ccc8f8627feef2cff32 ("xfs: Sanity check flags of Q_XQUOTARM call"), Linux 5.4 added checking for the flags argument, causing the test to fail due to too restrictive test expectations. Reviewed-by: Adhemerval Zanella (cherry picked from commit 1f7525d924b608a3e43b10fcfb3d46b8a6e9e4f9) Diff: --- sysdeps/unix/sysv/linux/test-errno-linux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/test-errno-linux.c b/sysdeps/unix/sysv/linux/test-errno-linux.c index cb979d4..aaa9ead 100644 --- a/sysdeps/unix/sysv/linux/test-errno-linux.c +++ b/sysdeps/unix/sysv/linux/test-errno-linux.c @@ -160,8 +160,9 @@ do_test (void) fails |= test_wrp (EINVAL, poll, &pollfd, -1, 0); /* quotactl returns ENOSYS for kernels not configured with CONFIG_QUOTA, and may return EPERM if called within certain types - of containers. */ - fails |= test_wrp2 (LIST (ENODEV, ENOSYS, EPERM), + of containers. Linux 5.4 added additional argument validation + and can return EINVAL. */ + fails |= test_wrp2 (LIST (ENODEV, ENOSYS, EPERM, EINVAL), quotactl, Q_GETINFO, NULL, -1, (caddr_t) &dqblk); fails |= test_wrp (EINVAL, sched_getparam, -1, &sch_param); fails |= test_wrp (EINVAL, sched_getscheduler, -1);