[PATCH] rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition

Gleb Fotengauer-Malinovskiy posted 1 patch 4 years ago
There is a newer version of this series
include/uapi/linux/rfkill.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition
Posted by Gleb Fotengauer-Malinovskiy 4 years ago
Fixes: 54f586a91532 ("rfkill: make new event layout opt-in")
---
 include/uapi/linux/rfkill.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h
index 283c5a7b3f2c..db6c8588c1d0 100644
--- a/include/uapi/linux/rfkill.h
+++ b/include/uapi/linux/rfkill.h
@@ -184,7 +184,7 @@ struct rfkill_event_ext {
 #define RFKILL_IOC_NOINPUT	1
 #define RFKILL_IOCTL_NOINPUT	_IO(RFKILL_IOC_MAGIC, RFKILL_IOC_NOINPUT)
 #define RFKILL_IOC_MAX_SIZE	2
-#define RFKILL_IOCTL_MAX_SIZE	_IOW(RFKILL_IOC_MAGIC, RFKILL_IOC_EXT_SIZE, __u32)
+#define RFKILL_IOCTL_MAX_SIZE	_IOW(RFKILL_IOC_MAGIC, RFKILL_IOC_MAX_SIZE, __u32)
 
 /* and that's all userspace gets */
 
-- 
glebfm
Re: [PATCH] rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition
Posted by Johannes Berg 4 years ago
On Fri, 2022-05-06 at 17:15 +0000, Gleb Fotengauer-Malinovskiy wrote:
> Fixes: 54f586a91532 ("rfkill: make new event layout opt-in")
> ---
>  include/uapi/linux/rfkill.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h
> index 283c5a7b3f2c..db6c8588c1d0 100644
> --- a/include/uapi/linux/rfkill.h
> +++ b/include/uapi/linux/rfkill.h
> @@ -184,7 +184,7 @@ struct rfkill_event_ext {
>  #define RFKILL_IOC_NOINPUT	1
>  #define RFKILL_IOCTL_NOINPUT	_IO(RFKILL_IOC_MAGIC, RFKILL_IOC_NOINPUT)
>  #define RFKILL_IOC_MAX_SIZE	2
> -#define RFKILL_IOCTL_MAX_SIZE	_IOW(RFKILL_IOC_MAGIC, RFKILL_IOC_EXT_SIZE, __u32)
> +#define RFKILL_IOCTL_MAX_SIZE	_IOW(RFKILL_IOC_MAGIC, RFKILL_IOC_MAX_SIZE, __u32)
> 

Oops. But I still need your Signed-off-by (see the documentation), and a
commit message would be nice :)

johannes
[PATCH v2] rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition
Posted by Gleb Fotengauer-Malinovskiy 4 years ago
Fixes: 54f586a91532 ("rfkill: make new event layout opt-in")
Cc: stable@vger.kernel.org # 5.11+
Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
---
 include/uapi/linux/rfkill.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h
index 283c5a7b3f2c..db6c8588c1d0 100644
--- a/include/uapi/linux/rfkill.h
+++ b/include/uapi/linux/rfkill.h
@@ -184,7 +184,7 @@ struct rfkill_event_ext {
 #define RFKILL_IOC_NOINPUT	1
 #define RFKILL_IOCTL_NOINPUT	_IO(RFKILL_IOC_MAGIC, RFKILL_IOC_NOINPUT)
 #define RFKILL_IOC_MAX_SIZE	2
-#define RFKILL_IOCTL_MAX_SIZE	_IOW(RFKILL_IOC_MAGIC, RFKILL_IOC_EXT_SIZE, __u32)
+#define RFKILL_IOCTL_MAX_SIZE	_IOW(RFKILL_IOC_MAGIC, RFKILL_IOC_MAX_SIZE, __u32)
 
 /* and that's all userspace gets */
 
-- 
glebfm
Re: [PATCH v2] rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition
Posted by Greg KH 4 years ago
On Fri, May 06, 2022 at 05:24:54PM +0000, Gleb Fotengauer-Malinovskiy wrote:
> Fixes: 54f586a91532 ("rfkill: make new event layout opt-in")
> Cc: stable@vger.kernel.org # 5.11+
> Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
> ---

No changelog text at all?  I know I don't take patches like that, maybe
other subsystem maintainers are more lax?

Please provide a changelog...

thanks,

greg k-h
Re: [PATCH v2] rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition
Posted by Dmitry V. Levin 4 years ago
On Sat, May 07, 2022 at 09:05:57AM +0200, Greg KH wrote:
> On Fri, May 06, 2022 at 05:24:54PM +0000, Gleb Fotengauer-Malinovskiy wrote:
> > Fixes: 54f586a91532 ("rfkill: make new event layout opt-in")
> > Cc: stable@vger.kernel.org # 5.11+
> > Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
> > ---
> 
> No changelog text at all?  I know I don't take patches like that, maybe
> other subsystem maintainers are more lax?
> 
> Please provide a changelog...

The definition of RFKILL_IOCTL_MAX_SIZE introduced by commit 54f586a91532
is unusable since it is based on RFKILL_IOC_EXT_SIZE which has not been
defined.  Fix that by replacing the undefined constant with the constant
which is intended to be used in this definition.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>


-- 
ldv