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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 5B21E3857C5F for ; Tue, 29 Sep 2020 07:57:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5B21E3857C5F 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-191-c5VCmSjFNZWRXOH2azso2w-1; Tue, 29 Sep 2020 03:57:14 -0400 X-MC-Unique: c5VCmSjFNZWRXOH2azso2w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D4FD109107B; Tue, 29 Sep 2020 07:57:13 +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 0A85D73665; Tue, 29 Sep 2020 07:57:11 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella via Libc-alpha Cc: Adhemerval Zanella , Robert O'Callahan , "Dmitry V . Levin" Subject: Re: [PATCH 3/6] sysvipc: Fix IPC_INFO and MSG_INFO handling [BZ #26639] References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> <20200928144556.239160-3-adhemerval.zanella@linaro.org> Date: Tue, 29 Sep 2020 09:57:10 +0200 In-Reply-To: <20200928144556.239160-3-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Mon, 28 Sep 2020 11:45:53 -0300") Message-ID: <87blhpyq09.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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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: Tue, 29 Sep 2020 07:57:18 -0000 * Adhemerval Zanella via Libc-alpha: > +static int > +read_proc_file (const char *file) > +{ > + FILE *f = fopen (file, "r"); > + if (f == NULL) > + return -1; > + > + int v; > + int r = fscanf (f, "%d", & v); > + TEST_VERIFY_EXIT (r == 1); > + > + fclose (f); > + return v; > +} You could use xfopen and xfclose. > +/* Check if the message queue with IDX (index into the kernel's internal > + array) matches the one with KEY. The CMD is either MSG_STAT or > + MSG_STAT_ANY. */ > + > +static bool > +check_msginfo (int idx, key_t key, int cmd) > +{ > + struct msqid_ds msginfo; > + int mid = msgctl (idx, cmd, &msginfo); > + /* Ignore unused array slot returned by the kernel or information from > + unknown message queue. */ > + if ((mid == -1 && errno == EINVAL) || mid != msqid) > + return false; > + > + if (mid == -1) > + FAIL_EXIT1 ("msgctl with %s failed: %m", > + cmd == MSG_STAT ? "MSG_STAT" : "MSG_STAT_ANY"); > + > + if (msginfo.msg_perm.__key != key) > + FAIL_EXIT1 ("msgid_ds::msg_perm::key (%d) != %d", > + (int) msginfo.msg_perm.__key, (int) key); > + if (msginfo.msg_perm.mode != MSGQ_MODE) > + FAIL_EXIT1 ("msgid_ds::msg_perm::mode (%o) != %o", > + msginfo.msg_perm.mode, MSGQ_MODE); > + if (msginfo.msg_qnum != 0) > + FAIL_EXIT1 ("msgid_ds::msg_qnum (%lu) != 0", > + (long unsigned) msginfo.msg_qnum); As in the other patch, you might want to use TEST_COMPARE here. Rest looks okay, I think. 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