linux-kernel - Re: [PATCH v5] HID: apple: Properly handle function keys on non-Apple keyboard

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPnXWxFU1RfVJ1LRMxevPSH5Y0tggx-t7ZuwdXkrba9mmOLojw@mail.gmail.com>
Date:   Thu, 2 Jun 2022 15:00:57 -0600
From:   Bryan Cain <bryancain3@...il.com>
To:     Hilton Chain <hako@...rarare.space>
Cc:     José Expósito <jose.exposito89@...il.com>,
        linux-kernel@...r.kernel.org, linux-input@...r.kernel.org,
        Jiri Kosina <jikos@...nel.org>,
        Benjamin Tissoires <benjamin.tissoires@...hat.com>
Subject: Re: [PATCH v5] HID: apple: Properly handle function keys on non-Apple keyboard

This version looks good, and works without issue on my Keychron C1.
Thanks for implementing it!

Reviewed-by: Bryan Cain <bryancain3@...il.com>
Tested-by: Bryan Cain <bryancain3@...il.com>

Regards,
Bryan

On Thu, Jun 2, 2022 at 2:12 AM Hilton Chain <hako@...rarare.space> wrote:
>
> This commit extends fa33382c7f74 ("HID: apple: Properly handle function
> keys on Keychron keyboards") by adding an array of known non-Apple
> keyboards' device names, and the function apple_is_non_apple_keyboard()
> to identify and create exception for them.
>
> Signed-off-by: Hilton Chain <hako@...rarare.space>
> ---
>
> V4 -> V5: Add Varmilo keyboards' name "AONE" to the exception list
> V3 -> V4: Remove unnecessary strlen()
>
>  drivers/hid/hid-apple.c | 34 +++++++++++++++++++++++++++++-----
>  1 file changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> index 42a568902f49..7fbde58e1219 100644
> --- a/drivers/hid/hid-apple.c
> +++ b/drivers/hid/hid-apple.c
> @@ -36,7 +36,7 @@
>  #define APPLE_NUMLOCK_EMULATION        BIT(8)
>  #define APPLE_RDESC_BATTERY    BIT(9)
>  #define APPLE_BACKLIGHT_CTL    BIT(10)
> -#define APPLE_IS_KEYCHRON      BIT(11)
> +#define APPLE_IS_NON_APPLE     BIT(11)
>
>  #define APPLE_FLAG_FKEY                0x01
>
> @@ -65,6 +65,10 @@ MODULE_PARM_DESC(swap_fn_leftctrl, "Swap the Fn and left Control keys. "
>                 "(For people who want to keep PC keyboard muscle memory. "
>                 "[0] = as-is, Mac layout, 1 = swapped, PC layout)");
>
> +struct apple_non_apple_keyboard {
> +       char *name;
> +};
> +
>  struct apple_sc_backlight {
>         struct led_classdev cdev;
>         struct hid_device *hdev;
> @@ -313,6 +317,26 @@ static const struct apple_key_translation swapped_fn_leftctrl_keys[] = {
>         { }
>  };
>
> +static const struct apple_non_apple_keyboard non_apple_keyboards[] = {
> +       { "SONiX USB DEVICE" },
> +       { "Keychron" },
> +       { "AONE" }
> +};
> +
> +static bool apple_is_non_apple_keyboard(struct hid_device *hdev)
> +{
> +       int i;
> +
> +       for (i = 0; i < ARRAY_SIZE(non_apple_keyboards); i++) {
> +               char *non_apple = non_apple_keyboards[i].name;
> +
> +               if (strncmp(hdev->name, non_apple, strlen(non_apple)) == 0)
> +                       return true;
> +       }
> +
> +       return false;
> +}
> +
>  static inline void apple_setup_key_translation(struct input_dev *input,
>                 const struct apple_key_translation *table)
>  {
> @@ -363,7 +387,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
>         }
>
>         if (fnmode == 3) {
> -               real_fnmode = (asc->quirks & APPLE_IS_KEYCHRON) ? 2 : 1;
> +               real_fnmode = (asc->quirks & APPLE_IS_NON_APPLE) ? 2 : 1;
>         } else {
>                 real_fnmode = fnmode;
>         }
> @@ -669,9 +693,9 @@ static int apple_input_configured(struct hid_device *hdev,
>                 asc->quirks &= ~APPLE_HAS_FN;
>         }
>
> -       if (strncmp(hdev->name, "Keychron", 8) == 0) {
> -               hid_info(hdev, "Keychron keyboard detected; function keys will default to fnmode=2 behavior\n");
> -               asc->quirks |= APPLE_IS_KEYCHRON;
> +       if (apple_is_non_apple_keyboard(hdev)) {
> +               hid_info(hdev, "Non-apple keyboard detected; function keys will default to fnmode=2 behavior\n");
> +               asc->quirks |= APPLE_IS_NON_APPLE;
>         }
>
>         return 0;
>
> base-commit: d1dc87763f406d4e67caf16dbe438a5647692395
> --
> 2.36.1
>