[PATCH HID v2 04/11] HID: bpf: allow write access to quirks field in struct hid_device

[Benjamin Tissoires]

This allows to give more control from BPF during report descriptor fixup.
We already reset the quirks before calling ->probe(), so now we reset
it once before calling hid_bpf_rdesc_fixup().

Signed-off-by: Benjamin Tissoires <bent...@kernel.org>

---

new in v2
---
 drivers/hid/bpf/hid_bpf_struct_ops.c |  1 +
 drivers/hid/hid-core.c               | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/bpf/hid_bpf_struct_ops.c 
b/drivers/hid/bpf/hid_bpf_struct_ops.c
index cd696c59ba0f..e4c25ade54a3 100644
--- a/drivers/hid/bpf/hid_bpf_struct_ops.c
+++ b/drivers/hid/bpf/hid_bpf_struct_ops.c
@@ -79,6 +79,7 @@ static int hid_bpf_ops_btf_struct_access(struct 
bpf_verifier_log *log,
                WRITE_RANGE(hid_device, name, true),
                WRITE_RANGE(hid_device, uniq, true),
                WRITE_RANGE(hid_device, phys, true),
+               WRITE_RANGE(hid_device, quirks, false),
        };
 #undef WRITE_RANGE
        const struct btf_type *state = NULL;
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 2b70a12a2135..37e52759a931 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2676,9 +2676,17 @@ static int __hid_device_probe(struct hid_device *hdev, 
struct hid_driver *hdrv)
        int ret;
 
        if (!hdev->bpf_rsize) {
+               unsigned int quirks;
+
+               /* reset the quirks that has been previously set */
+               quirks = hid_lookup_quirk(hdev);
+               hdev->quirks = quirks;
                hdev->bpf_rsize = hdev->dev_rsize;
                hdev->bpf_rdesc = call_hid_bpf_rdesc_fixup(hdev, 
hdev->dev_rdesc,
                                                           &hdev->bpf_rsize);
+               if (quirks ^ hdev->quirks)
+                       hid_info(hdev, "HID-BPF toggled quirks on the device: 
%04x",
+                                quirks ^ hdev->quirks);
        }
 
        if (!hid_check_device_match(hdev, hdrv, &id))
@@ -2688,8 +2696,6 @@ static int __hid_device_probe(struct hid_device *hdev, 
struct hid_driver *hdrv)
        if (!hdev->devres_group_id)
                return -ENOMEM;
 
-       /* reset the quirks that has been previously set */
-       hdev->quirks = hid_lookup_quirk(hdev);
        hdev->driver = hdrv;
 
        if (hdrv->probe) {

-- 
2.46.0