2024-05-23 09:25:36

by Dmitry V. Levin

Subject: [PATCH] uapi: linux/kd.h: include missing header

Given that linux/kd.h now uses macros defined in linux/ioctl.h,
do not rely on that header being already included by linux/kd.h users
and include linux/ioctl.h explicitly.

This bug was found by strace CI.

Fixes: 8c467f330059 ("VT: Use macros to define ioctls")
Signed-off-by: Dmitry V. Levin <[email protected]>
---
include/uapi/linux/kd.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
index 8ddb2219a84b..8fcce939ba25 100644
--- a/include/uapi/linux/kd.h
+++ b/include/uapi/linux/kd.h
@@ -3,6 +3,7 @@
#define _UAPI_LINUX_KD_H
#include <linux/types.h>
#include <linux/compiler.h>
+#include <linux/ioctl.h>

/* 0x4B is 'K', to avoid collision with termios and vt */
#define KD_IOCTL_BASE 'K'
--
ldv

2024-05-23 09:29:33

by Alexey Gladkov

Subject: Re: [PATCH] uapi: linux/kd.h: include missing header

On Thu, May 23, 2024 at 12:23:10PM +0300, Dmitry V. Levin wrote:
> Given that linux/kd.h now uses macros defined in linux/ioctl.h,
> do not rely on that header being already included by linux/kd.h users
> and include linux/ioctl.h explicitly.
>
> This bug was found by strace CI.
>
> Fixes: 8c467f330059 ("VT: Use macros to define ioctls")
> Signed-off-by: Dmitry V. Levin <[email protected]>

Acked-by: Alexey Gladkov <[email protected]>

> ---
> include/uapi/linux/kd.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
> index 8ddb2219a84b..8fcce939ba25 100644
> --- a/include/uapi/linux/kd.h
> +++ b/include/uapi/linux/kd.h
> @@ -3,6 +3,7 @@
> #define _UAPI_LINUX_KD_H
> #include <linux/types.h>
> #include <linux/compiler.h>
> +#include <linux/ioctl.h>
>
> /* 0x4B is 'K', to avoid collision with termios and vt */
> #define KD_IOCTL_BASE 'K'
> --
> ldv
>

--
Rgrds, legion