From patchwork Mon Jun 16 16:02:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1512 Received: (qmail 2159 invoked by alias); 16 Jun 2014 16:02:16 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 2144 invoked by uid 89); 16 Jun 2014 16:02:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Message-ID: <539F1502.4040506@redhat.com> Date: Mon, 16 Jun 2014 18:02:10 +0200 From: Florian Weimer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: GNU C Library Subject: [PATCH committed] Fix tautological comparison in non-executed part of tst-setuid2 (BZ #17058) This part never runs with the current implementation because the setresuid call currently aborts (as intended). 2014-06-16 Florian Weimer [BZ #17058] * nptl/tst-setuid2.c (do_test): Fix tautological comparison in non-executed part of the test. diff --git a/NEWS b/NEWS index 38cc5b5..52cd9b6 100644 --- a/NEWS +++ b/NEWS @@ -19,7 +19,7 @@ Version 2.20 16791, 16796, 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16849, 16854, 16876, 16877, 16878, 16882, 16885, 16888, 16890, 16912, 16915, 16916, 16917, 16922, 16927, 16928, 16932, 16943, 16958, 16965, 16966, - 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17042, 17048. + 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17042, 17048, 17058. * The minimum Linux kernel version that this version of the GNU C Library can be used with is 2.6.32. diff --git a/nptl/tst-setuid2.c b/nptl/tst-setuid2.c index 951aecc..260aa38 100644 --- a/nptl/tst-setuid2.c +++ b/nptl/tst-setuid2.c @@ -135,7 +135,7 @@ do_test (void) /* If we get here, check that the kernel did the right thing. */ run_on_thread (get_thread_ids); - if (ruid != 1001 || euid != 1002 || euid != 1003) + if (ruid != 1001 || euid != 1002 || suid != 1003) FAIL ("unexpected UIDs after setuid: %ld, %ld, %ld", (long) ruid, (long) euid, (long) suid); return 0;