[Intel-xe] [Intel-gfx] [PATCH i-g-t v3 02/11] lib/kunit: Fix handling of potential errors from F_GETFL

Mauro Carvalho Chehab mauro.chehab at linux.intel.com
Thu Oct 12 14:46:29 UTC 2023


On Wed, 11 Oct 2023 16:17:37 +0200
Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com> wrote:

> Function fcntl(..., F_GETFL, ...) that returns file status flags may also
> return a negative error code.  Handle that error instead of blindly using
> the returned value as flags.
> 
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>
> Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

Reviewed-by: Mauro Carvaho Chehab <mchehab at kernel.org>

> ---
>  lib/igt_kmod.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
> index d98e6c5f9e..05ff178b27 100644
> --- a/lib/igt_kmod.c
> +++ b/lib/igt_kmod.c
> @@ -783,8 +783,8 @@ static void __igt_kunit(struct igt_ktest *tst, const char *opts)
>  
>  	igt_skip_on_f(tst->kmsg < 0, "Could not open /dev/kmsg\n");
>  
> -	flags = fcntl(tst->kmsg, F_GETFL, 0) & ~O_NONBLOCK;
> -	igt_skip_on_f(fcntl(tst->kmsg, F_SETFL, flags) == -1,
> +	igt_skip_on((flags = fcntl(tst->kmsg, F_GETFL, 0), flags < 0));
> +	igt_skip_on_f(fcntl(tst->kmsg, F_SETFL, flags & ~O_NONBLOCK) == -1,
>  		      "Could not set /dev/kmsg to blocking mode\n");
>  
>  	igt_skip_on(lseek(tst->kmsg, 0, SEEK_END) < 0);


More information about the Intel-xe mailing list