| From a36e07dfe6ee71e209383ea9288cd8d1617e14f9 Mon Sep 17 00:00:00 2001 |
| From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> |
| Date: Fri, 6 May 2022 17:24:54 +0000 |
| Subject: rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition |
| |
| From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> |
| |
| commit a36e07dfe6ee71e209383ea9288cd8d1617e14f9 upstream. |
| |
| The definition of RFKILL_IOCTL_MAX_SIZE introduced by commit |
| 54f586a91532 ("rfkill: make new event layout opt-in") 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. |
| |
| 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> |
| Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> |
| Link: https://lore.kernel.org/r/20220506172454.120319-1-glebfm@altlinux.org |
| [add commit message provided later by Dmitry] |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/uapi/linux/rfkill.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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 */ |
| |
