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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 95E5138618E2 for ; Mon, 28 Sep 2020 14:59:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 95E5138618E2 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-bDdp9sQRMBKh6xLQLQ296A-1; Mon, 28 Sep 2020 10:59:33 -0400 X-MC-Unique: bDdp9sQRMBKh6xLQLQ296A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6894801F98; Mon, 28 Sep 2020 14:59:31 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-114-84.ams2.redhat.com [10.36.114.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5857660C11; Mon, 28 Sep 2020 14:59:30 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella via Libc-alpha Cc: Adhemerval Zanella , Robert O'Callahan , "Dmitry V . Levin" Subject: Re: [PATCH 1/6] sysvipc: Fix SEM_STAT_ANY kernel argument pass [BZ #26637] References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> Date: Mon, 28 Sep 2020 16:59:28 +0200 In-Reply-To: <20200928144556.239160-1-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Mon, 28 Sep 2020 11:45:51 -0300") Message-ID: <87v9fy2bhr.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.8 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_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 28 Sep 2020 14:59:36 -0000 * Adhemerval Zanella via Libc-alpha: > +/* Check if the semaphore with IDX (index into the kernel's internal array) > + matches the one with KEY. The CMD is either SEM_STAT or SEM_STAT_ANY. */ > + > +static bool > +check_seminfo (int idx, key_t key, int cmd) > +{ > + struct semid_ds seminfo; > + int sid = semctl (idx, 0, cmd, (union semun) { .buf = &seminfo }); > + /* Ignore unused array slot returned by the kernel or information from > + unknown semaphores. */ > + if ((sid == -1 && errno == EINVAL) || sid != semid) > + return false; > + > + if (sid == -1) > + FAIL_EXIT1 ("semctl with SEM_STAT failed (errno=%d)", errno); > + > + if (seminfo.sem_perm.__key != key) > + FAIL_EXIT1 ("semid_ds::sem_perm::key (%d) != %d", > + (int) seminfo.sem_perm.__key, (int) key); > + if (seminfo.sem_perm.mode != SEM_MODE) > + FAIL_EXIT1 ("semid_ds::sem_perm::mode (%o) != %o", > + seminfo.sem_perm.mode, SEM_MODE); > + if (seminfo.sem_nsems != 1) > + FAIL_EXIT1 ("semid_ds::sem_nsems (%lu) != 1", > + (long unsigned) seminfo.sem_nsems); > + > + return true; > +} Did you mean to include idx in the FAIL_EXIT1 output? Otherwise you could use TEST_COMPARE here? > diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c > index 01dbff343a..b7284e0b48 100644 > --- a/sysvipc/test-sysvsem.c > +++ b/sysvipc/test-sysvsem.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #include > #include > #include Stray change? Rest looks okay to me. Thanks, Florian -- Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn, Commercial register: Amtsgericht Muenchen, HRB 153243, Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill