Re: [LTP] [PATCH] Fix cleanup procedure in the setuid04 test

[Jiří Paleček]

On Tue, 23 Jun 2009 17:41:15 +0200, Jiří Paleček <jpale...@web.de> wrote:

On Tue, 23 Jun 2009 16:49:03 +0200, Subrata Modak <subr...@linux.vnet.ibm.com> wrote:

On Tue, 2009-05-12 at 19:06 +0200, Jiri Palecek wrote:

Cleanup has to be made only once in the parent process; when the
 child makes the cleanup itself, the parent has nothing to cleanup,
 which makes him sad.

Signed-off-by: Jiri Palecek <jpale...@web.de>

Thanks.

Oh no, at the second sight I see I've posted a wrong (old) version of the patch. I'll send a correction shortly.

The correction is in the attachment. Please, apply.

Regards
    Jiri Palecek

---
 testcases/kernel/syscalls/setuid/setuid04.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


index 18f1d90..26a3868 100644
--- a/testcases/kernel/syscalls/setuid/setuid04.c
+++ b/testcases/kernel/syscalls/setuid/setuid04.c
@@ -114,7 +114,7 @@ void do_master_child()
        int status;

        if (setuid(ltpuser->pw_uid) == -1) {
-               tst_brkm(TBROK, cleanup,
+               tst_brkm(TBROK, tst_exit,
                         "setuid failed to set the effective uid to %d",
                         ltpuser->pw_uid);
        }
@@ -143,7 +143,7 @@ void do_master_child()

                pid = FORK_OR_VFORK();
                if (pid < 0)
-                       tst_brkm(TBROK, cleanup, "Fork failed");
+                       tst_brkm(TBROK, tst_exit, "Fork failed");

                if (pid == 0) {
                        int tst_fd2;
@@ -160,13 +160,12 @@ void do_master_child()

                        if (TEST_ERRNO == EACCES) {
                                tst_resm(TPASS, "open returned errno EACCES");
-                               exit(0);
                        } else {
                                tst_resm(TFAIL,
                                         "open returned unexpected errno - %d",
                                         TEST_ERRNO);
-                               exit(-1);
                        }
+                       tst_exit();
                } else {
                        /* Wait for son completion */
                        waitpid(pid, &status, 0);

diff --git a/testcases/kernel/syscalls/setuid/setuid04.c b/testcases/kernel/syscalls/setuid/setuid04.c

--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/

[PATCH] Fix cleanup procedure in the setuid04 test.mbs
Description: Binary data

------------------------------------------------------------------------------

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list