Commit 054e0bd3 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.12/constify-rdesc' into for-linus 

- Constification of report descriptors so drivers can use read-only
  memory when declaring report descriptors fixups (Thomas Weißschuh)
parents 37c25a50 9f5305ed

drivers/hid/bpf/hid_bpf_dispatch.c

+2 −4
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int dispatch_hid_bpf_output_report(struct hid_device *hdev, 
}

EXPORT_SYMBOL_GPL(dispatch_hid_bpf_output_report);



u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *size)

u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, const u8 *rdesc, unsigned int *size)

{

	int ret;

	struct hid_bpf_ctx_kern ctx_kern = {
@@ -179,9 +179,7 @@ u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *s 
		*size = ret;

	}



	rdesc = krealloc(ctx_kern.data, *size, GFP_KERNEL);



	return rdesc;

	return krealloc(ctx_kern.data, *size, GFP_KERNEL);



 ignore_bpf:

	kfree(ctx_kern.data);

drivers/hid/hid-apple.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static void apple_battery_timer_tick(struct timer_list *t) 
 * MacBook JIS keyboard has wrong logical maximum

 * Magic Keyboard JIS has wrong logical maximum

 */

static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,

static const __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct apple_sc *asc = hid_get_drvdata(hdev);

drivers/hid/hid-asus.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ static const __u8 asus_g752_fixed_rdesc[] = { 
        0x2A, 0xFF, 0x00,		/*   Usage Maximum (0xFF)       */

};



static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,

static const __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct asus_drvdata *drvdata = hid_get_drvdata(hdev);

drivers/hid/hid-aureal.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include "hid-ids.h"



static __u8 *aureal_report_fixup(struct hid_device *hdev, __u8 *rdesc,

static const __u8 *aureal_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) {

drivers/hid/hid-bigbenff.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
 * - map previously unused analog trigger data to Z/RZ

 * - simplify feature and output descriptor

 */

static __u8 pid0902_rdesc_fixed[] = {

static const __u8 pid0902_rdesc_fixed[] = {

	0x05, 0x01,        /* Usage Page (Generic Desktop Ctrls) */

	0x09, 0x05,        /* Usage (Game Pad) */

	0xA1, 0x01,        /* Collection (Application) */
@@ -464,12 +464,12 @@ static int bigben_probe(struct hid_device *hid, 
	return error;

}



static __u8 *bigben_report_fixup(struct hid_device *hid, __u8 *rdesc,

static const __u8 *bigben_report_fixup(struct hid_device *hid, __u8 *rdesc,

	unsigned int *rsize)

{

	if (*rsize == PID0902_RDESC_ORIG_SIZE) {

		rdesc = pid0902_rdesc_fixed;

		*rsize = sizeof(pid0902_rdesc_fixed);

		return pid0902_rdesc_fixed;

	} else

		hid_warn(hid, "unexpected rdesc, please submit for review\n");

	return rdesc;