All of lore.kernel.org
 help / color / mirror / Atom feed
* [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc
@ 2021-10-05 13:46 Richard Palethorpe via ltp
  2021-10-05 13:46 ` [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy Richard Palethorpe via ltp
  2021-10-08 10:48 ` [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Cyril Hrubis
  0 siblings, 2 replies; 6+ messages in thread
From: Richard Palethorpe via ltp @ 2021-10-05 13:46 UTC (permalink / raw)
  To: ltp; +Cc: Richard Palethorpe

In 32-bit (regardless of kernel bits) glibc and musl will usually
dereference the timespec pointers and try to read them. In some cases
this might be avoidable, but they must do it in others.

Passing invalid pointers is undefined in POSIX. In any case, AFAICT
libc would have to catch the signal in order to guarantee EFAULT is
returned.

It's also reported that some other libc implementations dereference
the pointers even in 64bit. If this happens then it blocks more useful
testing. So this avoids passing bad pointers to libc.

Also turn test_type into a bitmask to reduce if statement length.

Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Acked-by: Jan Stancek <jstancek@redhat.com>
---

V2:
* Also remove check on 64-bit
* Avoid pause waiting for child proc
* Use bitmask

 .../clock_nanosleep/clock_nanosleep01.c         | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
index 382497918..6d81151b6 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
@@ -27,10 +27,10 @@ static void sighandler(int sig LTP_ATTRIBUTE_UNUSED)
 }
 
 enum test_type {
-	NORMAL,
-	SEND_SIGINT,
-	BAD_TS_ADDR_REQ,
-	BAD_TS_ADDR_REM,
+	NORMAL = 1,
+	SEND_SIGINT = 2,
+	BAD_TS_ADDR_REQ = 4,
+	BAD_TS_ADDR_REM = 8,
 };
 
 #define TYPE_NAME(x) .ttype = x, .desc = #x
@@ -138,7 +138,14 @@ static void do_test(unsigned int i)
 
 	tst_res(TINFO, "case %s", tc->desc);
 
-	if (tc->ttype == SEND_SIGINT || tc->ttype == BAD_TS_ADDR_REM)
+	if (tc->ttype & (BAD_TS_ADDR_REQ | BAD_TS_ADDR_REM) &&
+	    tv->clock_nanosleep == libc_clock_nanosleep) {
+		tst_res(TCONF,
+			"The libc wrapper may dereference req or rem");
+		return;
+	}
+
+	if (tc->ttype & (SEND_SIGINT | BAD_TS_ADDR_REM))
 		pid = create_sig_proc(SIGINT, 40, 500000);
 
 	tst_ts_set_sec(rq, tc->tv_sec);
-- 
2.33.0


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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy
  2021-10-05 13:46 [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Richard Palethorpe via ltp
@ 2021-10-05 13:46 ` Richard Palethorpe via ltp
  2021-10-08 10:49   ` Cyril Hrubis
  2021-10-08 10:48 ` [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Cyril Hrubis
  1 sibling, 1 reply; 6+ messages in thread
From: Richard Palethorpe via ltp @ 2021-10-05 13:46 UTC (permalink / raw)
  To: ltp; +Cc: Richard Palethorpe

Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
---
 testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
index 6d81151b6..eef8a5992 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
@@ -199,7 +199,7 @@ static void do_test(unsigned int i)
 		}
 
 		if (remain_ms > expect_ms) {
-			tst_res(TFAIL| TTERRNO,
+			tst_res(TFAIL | TTERRNO,
 				"remaining time > requested time (%lld > %lld)",
 				remain_ms, expect_ms);
 			return;
-- 
2.33.0


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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc
  2021-10-05 13:46 [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Richard Palethorpe via ltp
  2021-10-05 13:46 ` [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy Richard Palethorpe via ltp
@ 2021-10-08 10:48 ` Cyril Hrubis
  2021-10-11  8:05   ` Richard Palethorpe
  1 sibling, 1 reply; 6+ messages in thread
From: Cyril Hrubis @ 2021-10-08 10:48 UTC (permalink / raw)
  To: Richard Palethorpe; +Cc: ltp

Hi!
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] 6+ messages in thread

* Re: [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy
  2021-10-05 13:46 ` [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy Richard Palethorpe via ltp
@ 2021-10-08 10:49   ` Cyril Hrubis
  2021-10-11  8:05     ` Richard Palethorpe
  0 siblings, 1 reply; 6+ messages in thread
From: Cyril Hrubis @ 2021-10-08 10:49 UTC (permalink / raw)
  To: Richard Palethorpe; +Cc: ltp

Hi!
Obviously fine.

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] 6+ messages in thread

* Re: [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc
  2021-10-08 10:48 ` [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Cyril Hrubis
@ 2021-10-11  8:05   ` Richard Palethorpe
  0 siblings, 0 replies; 6+ messages in thread
From: Richard Palethorpe @ 2021-10-11  8:05 UTC (permalink / raw)
  To: Cyril Hrubis; +Cc: ltp

Hi,

Cyril Hrubis <chrubis@suse.cz> writes:

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

Pushed thanks!

-- 
Thank you,
Richard.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy
  2021-10-08 10:49   ` Cyril Hrubis
@ 2021-10-11  8:05     ` Richard Palethorpe
  0 siblings, 0 replies; 6+ messages in thread
From: Richard Palethorpe @ 2021-10-11  8:05 UTC (permalink / raw)
  To: Cyril Hrubis; +Cc: ltp

Hi,

Cyril Hrubis <chrubis@suse.cz> writes:

> Hi!
> Obviously fine.
>
> Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

Pushed thanks!

-- 
Thank you,
Richard.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-10-11  8:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 13:46 [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Richard Palethorpe via ltp
2021-10-05 13:46 ` [LTP] [PATCH v2 2/2] clock_nanosleep01: Add space to make make-check happy Richard Palethorpe via ltp
2021-10-08 10:49   ` Cyril Hrubis
2021-10-11  8:05     ` Richard Palethorpe
2021-10-08 10:48 ` [LTP] [PATCH v2 1/2] clock_nanosleep01: Avoid dereferencing bad pointers in libc Cyril Hrubis
2021-10-11  8:05   ` 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.