[LTP] [PATCH tbt_cases] umip_basic_test.c: update umip basic test for new kernel v5.4

[LTP] [PATCH tbt_cases] umip_basic_test.c: update umip basic test for new kernel v5.4

[Pengfei Xu]

After linux kernel v5.4 mainline, 64bit SGDT SIDT SMSW will return
dummy value and not trigger SIGSEGV due to kernel code change.
For detailed kernel update info, you could check v5.4 commit:
x86/umip: Add emulation (spoofing) for UMIP covered instructions in
64-bit processes as well

Signed-off-by: Pengfei Xu <pengfei.xu@intel.com>
---
 testcases/kernel/security/umip/umip_basic_test.c | 25 ++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/testcases/kernel/security/umip/umip_basic_test.c b/testcases/kernel/security/umip/umip_basic_test.c
index 37850ef9f..278ae92f6 100644
--- a/testcases/kernel/security/umip/umip_basic_test.c
+++ b/testcases/kernel/security/umip/umip_basic_test.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <signal.h>
+#include <linux/version.h>
 
 #include "tst_test.h"
 #include "tst_safe_stdio.h"
@@ -112,11 +113,31 @@ static void verify_umip_instruction(unsigned int n)
 
 	SAFE_WAITPID(pid, &status, 0);
 
+	switch (n) {
+	case 0:
+	case 1:
+	case 3:
+		/* after linux kernel v5.4 mainline, 64bit SGDT SIDT SMSW will return
+		   dummy value and not trigger SIGSEGV due to kernel code change */
+		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+			tst_res(TINFO, "Linux kernel version is after than v5.4");
+			if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
+				tst_res(TFAIL, "Got SIGSEGV\n\n");
+				return;
+			}
+			tst_res(TPASS, "Didn't receive SIGSEGV, child exited with %s\n\n",
+				tst_strstatus(status));
+				return;
+		#else
+			tst_res(TINFO, "Linux kernel version is before than v5.4");
+		#endif
+	}
+
 	if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
-		tst_res(TPASS, "Got SIGSEGV");
+		tst_res(TPASS, "Got SIGSEGV\n\n");
 		return;
 	}
-	tst_res(TFAIL, "Didn't receive SIGSEGV, child exited with %s",
+	tst_res(TFAIL, "Didn't receive SIGSEGV, child exited with %s\n\n",
 		tst_strstatus(status));
 }
 
-- 
2.14.1

[LTP] [PATCH tbt_cases] umip_basic_test.c: update umip basic test for new kernel v5.4

[Cyril Hrubis]

Hi!
> +		/* after linux kernel v5.4 mainline, 64bit SGDT SIDT SMSW will return
> +		   dummy value and not trigger SIGSEGV due to kernel code change */
> +		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)

This is obviously wrong, the version you get here is the version from
kernel headers that does not correspond to the kernel you are running
on at all.

We do have tst_kvercmp() function in LTP that uses parses uname() output
and returns if you are running on kernel newer/same/older as the version
passed to that function. Use that one instead.

> +			tst_res(TINFO, "Linux kernel version is after than v5.4");
> +			if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
> +				tst_res(TFAIL, "Got SIGSEGV\n\n");
> +				return;
> +			}
> +			tst_res(TPASS, "Didn't receive SIGSEGV, child exited with %s\n\n",
> +				tst_strstatus(status));
> +				return;
				^
				Wrong indentation.

> +		#else
> +			tst_res(TINFO, "Linux kernel version is before than v5.4");
> +		#endif
> +	}
> +
>  	if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
> -		tst_res(TPASS, "Got SIGSEGV");
> +		tst_res(TPASS, "Got SIGSEGV\n\n");
>  		return;
>  	}
> -	tst_res(TFAIL, "Didn't receive SIGSEGV, child exited with %s",
> +	tst_res(TFAIL, "Didn't receive SIGSEGV, child exited with %s\n\n",
>  		tst_strstatus(status));

Can you please avoid polluting output with useless newlines as well?

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

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH tbt_cases] umip_basic_test.c: update umip basic test for new kernel v5.4

[Pengfei Xu]

Hi Hrubis,

  Thanks a lot for your comments! :)
  BR.

On 2019-10-03 at 14:14:02 +0200, Cyril Hrubis wrote:
> Hi!
> > +		/* after linux kernel v5.4 mainline, 64bit SGDT SIDT SMSW will return
> > +		   dummy value and not trigger SIGSEGV due to kernel code change */
> > +		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
> 
> This is obviously wrong, the version you get here is the version from
> kernel headers that does not correspond to the kernel you are running
> on at all.
> 
> We do have tst_kvercmp() function in LTP that uses parses uname() output
> and returns if you are running on kernel newer/same/older as the version
> passed to that function. Use that one instead.
> 
  Will use tst_kvercmp function, thanks.

> > +			tst_res(TINFO, "Linux kernel version is after than v5.4");
> > +			if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
> > +				tst_res(TFAIL, "Got SIGSEGV\n\n");
> > +				return;
> > +			}
> > +			tst_res(TPASS, "Didn't receive SIGSEGV, child exited with %s\n\n",
> > +				tst_strstatus(status));
> > +				return;
> 				^
> 				Wrong indentation.
> 
  Yes, will correct it.


> > +		#else
> > +			tst_res(TINFO, "Linux kernel version is before than v5.4");
> > +		#endif
> > +	}
> > +
> >  	if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
> > -		tst_res(TPASS, "Got SIGSEGV");
> > +		tst_res(TPASS, "Got SIGSEGV\n\n");
> >  		return;
> >  	}
> > -	tst_res(TFAIL, "Didn't receive SIGSEGV, child exited with %s",
> > +	tst_res(TFAIL, "Didn't receive SIGSEGV, child exited with %s\n\n",
> >  		tst_strstatus(status));
> 
> Can you please avoid polluting output with useless newlines as well?
> 
> >  }
  Ok, will avoid useless newlines.
  Thanks for all comments, will correct them.

> >  
> > -- 
> > 2.14.1
> > 
> > 
> > -- 
> > Mailing list info: https://lists.linux.it/listinfo/ltp
> 
> -- 
> Cyril Hrubis
> chrubis@suse.cz