Re: [LTP] [PATCH v3] getcwd01: Use syscall directly check invalid argument

[Petr Vorel <pvorel@suse.cz>]

> Fixes: #1084

You haven't written the reason for switching to raw syscall syscall(__NR_getcwd, ...).
(Adding https://github.com/linux-test-project/ltp/issues/1084 is not enough, the
reason for the change is important enough to write to the commit message).

Also, raw syscall obviously returns a different errnos than glibc wrapper.
But again, it would be better to document in the commit message the reason for
the errno change.



> Signed-off-by: Wei Gao <wegao@suse.com>
> ---
>  testcases/kernel/syscalls/getcwd/getcwd01.c | 27 ++++++---------------
>  1 file changed, 7 insertions(+), 20 deletions(-)

> diff --git a/testcases/kernel/syscalls/getcwd/getcwd01.c b/testcases/kernel/syscalls/getcwd/getcwd01.c
> index 65d827873..ac35383a4 100644
> --- a/testcases/kernel/syscalls/getcwd/getcwd01.c
> +++ b/testcases/kernel/syscalls/getcwd/getcwd01.c
> @@ -14,8 +14,8 @@
>   *
>   * Expected Result:
>   * 1) getcwd(2) should return NULL and set errno to EFAULT.
> - * 2) getcwd(2) should return NULL and set errno to ENOMEM.
> - * 3) getcwd(2) should return NULL and set errno to EINVAL.
> + * 2) getcwd(2) should return NULL and set errno to EFAULT.
> + * 3) getcwd(2) should return NULL and set errno to ERANGE.
>   * 4) getcwd(2) should return NULL and set errno to ERANGE.
>   * 5) getcwd(2) should return NULL and set errno to ERANGE.
>   *
> @@ -24,6 +24,7 @@
>  #include <errno.h>
>  #include <unistd.h>
>  #include <limits.h>
> +#include "lapi/syscalls.h"
>  #include "tst_test.h"

>  static char buffer[5];
> @@ -34,32 +35,18 @@ static struct t_case {
>  	int exp_err;
>  } tcases[] = {
>  	{(void *)-1, PATH_MAX, EFAULT},
> -	{NULL, (size_t)-1, ENOMEM},
> -	{buffer, 0, EINVAL},
> +	{NULL, (size_t)-1, EFAULT},
> +	{buffer, 0, ERANGE},
>  	{buffer, 1, ERANGE},
>  	{NULL, 1, ERANGE}
>  };

> +
>  static void verify_getcwd(unsigned int n)
>  {
>  	struct t_case *tc = &tcases[n];
> -	char *res;
> -
> -	errno = 0;
> -	res = getcwd(tc->buf, tc->size);
> -	TST_ERR = errno;
> -	if (res) {
> -		tst_res(TFAIL, "getcwd() succeeded unexpectedly");
> -		return;
> -	}
> -
> -	if (TST_ERR != tc->exp_err) {
> -		tst_res(TFAIL | TTERRNO, "getcwd() failed unexpectedly, expected %s",
> -			tst_strerrno(tc->exp_err));
> -		return;
> -	}

> -	tst_res(TPASS | TTERRNO, "getcwd() failed as expected");
> +	TST_EXP_FAIL2(syscall(__NR_getcwd, tc->buf, tc->size), tc->exp_err);

If the reason is that getcwd() wrapper in musl is not easily fixable (we
probably don't want #ifdef __GLIBC__), I'm ok for this.

OTOH if test would be easily fixable for musl, we could consider testing both
raw syscall and libc wrapper via .test_variants (separate effort).

Kind regards,
Petr

>  }

>  static struct tst_test test = {

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