* Re: [LTP] [PATCH] userns02: add SAFE_CLOSE
2015-06-16 21:53 [LTP] [PATCH] userns02: add SAFE_CLOSE Yuan Sun
@ 2015-06-16 14:03 ` Jan Stancek
0 siblings, 0 replies; 2+ messages in thread
From: Jan Stancek @ 2015-06-16 14:03 UTC (permalink / raw)
To: Yuan Sun; +Cc: ltp-list
----- Original Message -----
> From: "Yuan Sun" <sunyuan3@huawei.com>
> To: jstancek@redhat.com
> Cc: ltp-list@lists.sourceforge.net
> Sent: Tuesday, 16 June, 2015 11:53:51 PM
> Subject: [PATCH] userns02: add SAFE_CLOSE
>
> Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
> ---
> testcases/kernel/containers/userns/userns02.c | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/testcases/kernel/containers/userns/userns02.c
> b/testcases/kernel/containers/userns/userns02.c
> index ad5dda5..f5feceb 100644
> --- a/testcases/kernel/containers/userns/userns02.c
> +++ b/testcases/kernel/containers/userns/userns02.c
> @@ -31,6 +31,11 @@
> char *TCID = "user_namespace2";
> int TST_TOTAL = 1;
>
> +static void cleanup(void)
> +{
> + tst_rmdir();
> +}
> +
> /*
> * child_fn1() - Inside a new user namespace
> */
> @@ -39,7 +44,7 @@ static int child_fn1(void)
> int exit_val;
> int uid, gid;
>
> - TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
> + TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
You shouldn't call cleanup from child. The rest looks OK.
Regards,
Jan
> uid = geteuid();
> gid = getegid();
>
> @@ -62,11 +67,6 @@ static void setup(void)
> TST_CHECKPOINT_INIT(NULL);
> }
>
> -static void cleanup(void)
> -{
> - tst_rmdir();
> -}
> -
> int main(int argc, char *argv[])
> {
> int status;
> @@ -93,14 +93,16 @@ int main(int argc, char *argv[])
> parentgid = getegid();
> sprintf(path, "/proc/%d/uid_map", childpid);
> sprintf(content, "100 %d 1", parentuid);
> - fd = SAFE_OPEN(NULL, path, O_WRONLY, 0644);
> - SAFE_WRITE(NULL, 1, fd, content, strlen(content));
> + fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
> + SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
> + SAFE_CLOSE(cleanup, fd);
> sprintf(path, "/proc/%d/gid_map", childpid);
> sprintf(content, "100 %d 1", parentgid);
> - fd = SAFE_OPEN(NULL, path, O_WRONLY, 0644);
> - SAFE_WRITE(NULL, 1, fd, content, strlen(content));
> + fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
> + SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
> + SAFE_CLOSE(cleanup, fd);
>
> - TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
> + TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
>
> if (waitpid(childpid, &status, 0) < 0)
> tst_brkm(TBROK | TERRNO, cleanup, "waitpid failed");
> --
> 1.9.1
>
>
------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [LTP] [PATCH] userns02: add SAFE_CLOSE
@ 2015-06-16 21:53 Yuan Sun
2015-06-16 14:03 ` Jan Stancek
0 siblings, 1 reply; 2+ messages in thread
From: Yuan Sun @ 2015-06-16 21:53 UTC (permalink / raw)
To: jstancek; +Cc: ltp-list
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
---
testcases/kernel/containers/userns/userns02.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/testcases/kernel/containers/userns/userns02.c b/testcases/kernel/containers/userns/userns02.c
index ad5dda5..f5feceb 100644
--- a/testcases/kernel/containers/userns/userns02.c
+++ b/testcases/kernel/containers/userns/userns02.c
@@ -31,6 +31,11 @@
char *TCID = "user_namespace2";
int TST_TOTAL = 1;
+static void cleanup(void)
+{
+ tst_rmdir();
+}
+
/*
* child_fn1() - Inside a new user namespace
*/
@@ -39,7 +44,7 @@ static int child_fn1(void)
int exit_val;
int uid, gid;
- TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
+ TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
uid = geteuid();
gid = getegid();
@@ -62,11 +67,6 @@ static void setup(void)
TST_CHECKPOINT_INIT(NULL);
}
-static void cleanup(void)
-{
- tst_rmdir();
-}
-
int main(int argc, char *argv[])
{
int status;
@@ -93,14 +93,16 @@ int main(int argc, char *argv[])
parentgid = getegid();
sprintf(path, "/proc/%d/uid_map", childpid);
sprintf(content, "100 %d 1", parentuid);
- fd = SAFE_OPEN(NULL, path, O_WRONLY, 0644);
- SAFE_WRITE(NULL, 1, fd, content, strlen(content));
+ fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
+ SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
+ SAFE_CLOSE(cleanup, fd);
sprintf(path, "/proc/%d/gid_map", childpid);
sprintf(content, "100 %d 1", parentgid);
- fd = SAFE_OPEN(NULL, path, O_WRONLY, 0644);
- SAFE_WRITE(NULL, 1, fd, content, strlen(content));
+ fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
+ SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
+ SAFE_CLOSE(cleanup, fd);
- TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
+ TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
if (waitpid(childpid, &status, 0) < 0)
tst_brkm(TBROK | TERRNO, cleanup, "waitpid failed");
--
1.9.1
------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-16 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-16 21:53 [LTP] [PATCH] userns02: add SAFE_CLOSE Yuan Sun
2015-06-16 14:03 ` Jan Stancek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox