diff options
| author | Florian Weimer <fweimer@redhat.com> | 2014-06-16 18:00:09 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2014-06-16 18:00:09 +0200 |
| commit | a7291117328b413295ae7d1c841e944bc60062d3 (patch) | |
| tree | 01828262f0fdb6543b24ab5b26f1053bf7f67a36 | |
| parent | 3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e (diff) | |
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).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | nptl/tst-setuid2.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +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. + 2014-06-16 Andreas Schwab <schwab@suse.de> * string/bits/string2.h (strdup, strndup): Update feature guard. @@ -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 951aeccac5..260aa38eee 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; |