[committed] Fix tautological comparison in non-executed part of tst-setuid2 (BZ #17058)
diff mbox

Message ID 539F1502.4040506@redhat.com
State New
Headers show

Commit Message

Florian Weimer June 16, 2014, 4:02 p.m. UTC
This part never runs with the current implementation because the 
setresuid call currently aborts (as intended).

Comments

Ondřej Bílka June 20, 2014, 10:41 a.m. UTC | #1
On Mon, Jun 16, 2014 at 06:02:10PM +0200, Florian Weimer wrote:
> This part never runs with the current implementation because the
> setresuid call currently aborts (as intended).
>
looks obvious.

Patch
diff mbox

2014-06-16  Florian Weimer  <fweimer@redhat.com>

	[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;