All of lore.kernel.org
 help / color / mirror / Atom feed
* [LTP] [PATCH] msgrcv02: Add negative msgtyp tests
@ 2021-10-12  9:28 Richard Palethorpe via ltp
  2021-10-13  8:24 ` xuyang2018.jy
  2021-10-13 10:06 ` Cyril Hrubis
  0 siblings, 2 replies; 4+ messages in thread
From: Richard Palethorpe via ltp @ 2021-10-12  9:28 UTC (permalink / raw)
  To: ltp; +Cc: Richard Palethorpe

Test that we do not get higher message types. Also that -1 msgtyp is not
misinterpreted as INT_MAX by using MSG_EXCEPT.

Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
Suggested-by: Cyril Hrubis <chrubis@suse.cz>
---
 .../kernel/syscalls/ipc/msgrcv/msgrcv02.c     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
index cfb7d7446..fba6a5289 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
@@ -21,6 +21,8 @@
  *   msgflg and no message of the requested type existed on the message queue.
  */
 
+#define _GNU_SOURCE
+
 #include <string.h>
 #include <sys/wait.h>
 #include <sys/msg.h>
@@ -38,7 +40,7 @@ struct passwd *pw;
 static struct buf {
 	long type;
 	char mtext[MSGSIZE];
-} rcv_buf, snd_buf = {MSGTYPE, "hello"};
+} rcv_buf, snd_buf = {2, "hello"};
 
 static struct tcase {
 	int *id;
@@ -49,12 +51,15 @@ static struct tcase {
 	int exp_user;
 	int exp_err;
 } tcases[] = {
-	{&queue_id, &rcv_buf, 4, 1, 0, 0, E2BIG},
-	{&queue_id, &rcv_buf, MSGSIZE, 1, 0, 1, EACCES},
-	{&queue_id, NULL, MSGSIZE, 1, 0, 0, EFAULT},
-	{&bad_id, &rcv_buf, MSGSIZE, 1, 0, 0, EINVAL},
-	{&queue_id, &rcv_buf, -1, 1, 0, 0, EINVAL},
-	{&queue_id, &rcv_buf, MSGSIZE, 2, IPC_NOWAIT, 0, ENOMSG},
+	{&queue_id, &rcv_buf, MSGSIZE - 1, 2, 0, 0, E2BIG},
+	{&queue_id, &rcv_buf, MSGSIZE,     2, 0, 1, EACCES},
+	{&queue_id, NULL,     MSGSIZE,     2, 0, 0, EFAULT},
+	{&bad_id,   &rcv_buf, MSGSIZE,     2, 0, 0, EINVAL},
+	{&queue_id, &rcv_buf, -1,          2, 0, 0, EINVAL},
+
+	{&queue_id, &rcv_buf, MSGSIZE,  3, IPC_NOWAIT,              0, ENOMSG},
+	{&queue_id, &rcv_buf, MSGSIZE, -1, IPC_NOWAIT,              0, ENOMSG},
+	{&queue_id, &rcv_buf, MSGSIZE, -1, IPC_NOWAIT | MSG_EXCEPT, 0, ENOMSG},
 };
 
 static void verify_msgrcv(struct tcase *tc)
-- 
2.33.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH] msgrcv02: Add negative msgtyp tests
  2021-10-12  9:28 [LTP] [PATCH] msgrcv02: Add negative msgtyp tests Richard Palethorpe via ltp
@ 2021-10-13  8:24 ` xuyang2018.jy
  2021-10-13 10:06 ` Cyril Hrubis
  1 sibling, 0 replies; 4+ messages in thread
From: xuyang2018.jy @ 2021-10-13  8:24 UTC (permalink / raw)
  To: Richard Palethorpe; +Cc: Richard Palethorpe via ltp

Hi Richard
> Test that we do not get higher message types. Also that -1 msgtyp is not
> misinterpreted as INT_MAX by using MSG_EXCEPT.

Other than some unnecessary spaces or empty lines, this patch looks good 
to me.

Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>

Best Regards
Yang Xu
>
> Signed-off-by: Richard Palethorpe<rpalethorpe@suse.com>
> Suggested-by: Cyril Hrubis<chrubis@suse.cz>
> ---
>   .../kernel/syscalls/ipc/msgrcv/msgrcv02.c     | 19 ++++++++++++-------
>   1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
> index cfb7d7446..fba6a5289 100644
> --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
> +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
> @@ -21,6 +21,8 @@
>    *   msgflg and no message of the requested type existed on the message queue.
>    */
>
> +#define _GNU_SOURCE
> +
>   #include<string.h>
>   #include<sys/wait.h>
>   #include<sys/msg.h>
> @@ -38,7 +40,7 @@ struct passwd *pw;
>   static struct buf {
>   	long type;
>   	char mtext[MSGSIZE];
> -} rcv_buf, snd_buf = {MSGTYPE, "hello"};
> +} rcv_buf, snd_buf = {2, "hello"};
>
>   static struct tcase {
>   	int *id;
> @@ -49,12 +51,15 @@ static struct tcase {
>   	int exp_user;
>   	int exp_err;
>   } tcases[] = {
> -	{&queue_id,&rcv_buf, 4, 1, 0, 0, E2BIG},
> -	{&queue_id,&rcv_buf, MSGSIZE, 1, 0, 1, EACCES},
> -	{&queue_id, NULL, MSGSIZE, 1, 0, 0, EFAULT},
> -	{&bad_id,&rcv_buf, MSGSIZE, 1, 0, 0, EINVAL},
> -	{&queue_id,&rcv_buf, -1, 1, 0, 0, EINVAL},
> -	{&queue_id,&rcv_buf, MSGSIZE, 2, IPC_NOWAIT, 0, ENOMSG},
> +	{&queue_id,&rcv_buf, MSGSIZE - 1, 2, 0, 0, E2BIG},
> +	{&queue_id,&rcv_buf, MSGSIZE,     2, 0, 1, EACCES},
> +	{&queue_id, NULL,     MSGSIZE,     2, 0, 0, EFAULT},
> +	{&bad_id,&rcv_buf, MSGSIZE,     2, 0, 0, EINVAL},
> +	{&queue_id,&rcv_buf, -1,          2, 0, 0, EINVAL},
> +
> +	{&queue_id,&rcv_buf, MSGSIZE,  3, IPC_NOWAIT,              0, ENOMSG},
> +	{&queue_id,&rcv_buf, MSGSIZE, -1, IPC_NOWAIT,              0, ENOMSG},
> +	{&queue_id,&rcv_buf, MSGSIZE, -1, IPC_NOWAIT | MSG_EXCEPT, 0, ENOMSG},
>   };
>
>   static void verify_msgrcv(struct tcase *tc)

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH] msgrcv02: Add negative msgtyp tests
  2021-10-12  9:28 [LTP] [PATCH] msgrcv02: Add negative msgtyp tests Richard Palethorpe via ltp
  2021-10-13  8:24 ` xuyang2018.jy
@ 2021-10-13 10:06 ` Cyril Hrubis
  2021-10-13 11:32   ` Richard Palethorpe
  1 sibling, 1 reply; 4+ messages in thread
From: Cyril Hrubis @ 2021-10-13 10:06 UTC (permalink / raw)
  To: Richard Palethorpe; +Cc: ltp

Hi!
> Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
> Suggested-by: Cyril Hrubis <chrubis@suse.cz>
> ---
>  .../kernel/syscalls/ipc/msgrcv/msgrcv02.c     | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
> index cfb7d7446..fba6a5289 100644
> --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
> +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
> @@ -21,6 +21,8 @@
>   *   msgflg and no message of the requested type existed on the message queue.
>   */
>  
> +#define _GNU_SOURCE
> +
>  #include <string.h>
>  #include <sys/wait.h>
>  #include <sys/msg.h>
> @@ -38,7 +40,7 @@ struct passwd *pw;
>  static struct buf {
>  	long type;
>  	char mtext[MSGSIZE];
> -} rcv_buf, snd_buf = {MSGTYPE, "hello"};
> +} rcv_buf, snd_buf = {2, "hello"};
>  
>  static struct tcase {
>  	int *id;
> @@ -49,12 +51,15 @@ static struct tcase {
>  	int exp_user;
>  	int exp_err;
>  } tcases[] = {
> -	{&queue_id, &rcv_buf, 4, 1, 0, 0, E2BIG},
> -	{&queue_id, &rcv_buf, MSGSIZE, 1, 0, 1, EACCES},
> -	{&queue_id, NULL, MSGSIZE, 1, 0, 0, EFAULT},
> -	{&bad_id, &rcv_buf, MSGSIZE, 1, 0, 0, EINVAL},
> -	{&queue_id, &rcv_buf, -1, 1, 0, 0, EINVAL},
> -	{&queue_id, &rcv_buf, MSGSIZE, 2, IPC_NOWAIT, 0, ENOMSG},
> +	{&queue_id, &rcv_buf, MSGSIZE - 1, 2, 0, 0, E2BIG},
> +	{&queue_id, &rcv_buf, MSGSIZE,     2, 0, 1, EACCES},
> +	{&queue_id, NULL,     MSGSIZE,     2, 0, 0, EFAULT},
> +	{&bad_id,   &rcv_buf, MSGSIZE,     2, 0, 0, EINVAL},
> +	{&queue_id, &rcv_buf, -1,          2, 0, 0, EINVAL},
> +

I wouldn't have added this empty line. The rest of the spaces that
aligns the fields looks good to me though, it's easier to read that way.

> +	{&queue_id, &rcv_buf, MSGSIZE,  3, IPC_NOWAIT,              0, ENOMSG},
> +	{&queue_id, &rcv_buf, MSGSIZE, -1, IPC_NOWAIT,              0, ENOMSG},
> +	{&queue_id, &rcv_buf, MSGSIZE, -1, IPC_NOWAIT | MSG_EXCEPT, 0, ENOMSG},
>  };

With the empty line removed:

Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH] msgrcv02: Add negative msgtyp tests
  2021-10-13 10:06 ` Cyril Hrubis
@ 2021-10-13 11:32   ` Richard Palethorpe
  0 siblings, 0 replies; 4+ messages in thread
From: Richard Palethorpe @ 2021-10-13 11:32 UTC (permalink / raw)
  To: Cyril Hrubis; +Cc: ltp


Hello,

Thanks, pushed with line removed!

-- 
Thank you,
Richard.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-13 11:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12  9:28 [LTP] [PATCH] msgrcv02: Add negative msgtyp tests Richard Palethorpe via ltp
2021-10-13  8:24 ` xuyang2018.jy
2021-10-13 10:06 ` Cyril Hrubis
2021-10-13 11:32   ` Richard Palethorpe

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.