Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc7ed49a authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: hidraw: enforce minors_lock locking via lockdep 



lockdep is much more powerful enforcing the locking rules than code comments,
so let's switch to it.

Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent ecb4d529

drivers/hid/hidraw.c

+4 −4
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, 


/*

 * The first byte of the report buffer is expected to be a report number.

 *

 * This function is to be called with the minors_lock mutex held.

 */

static ssize_t hidraw_send_report(struct file *file, const char __user *buffer, size_t count, unsigned char report_type)

{
@@ -117,6 +115,8 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer, 
	__u8 *buf;

	int ret = 0;



	lockdep_assert_held(&minors_lock);



	if (!hidraw_table[minor] || !hidraw_table[minor]->exist) {

		ret = -ENODEV;

		goto out;
@@ -181,8 +181,6 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t 
 * of buffer is the report number to request, or 0x0 if the defice does not

 * use numbered reports. The report_type parameter can be HID_FEATURE_REPORT

 * or HID_INPUT_REPORT.

 *

 * This function is to be called with the minors_lock mutex held.

 */

static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t count, unsigned char report_type)

{
@@ -192,6 +190,8 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t 
	int ret = 0, len;

	unsigned char report_number;



	lockdep_assert_held(&minors_lock);



	if (!hidraw_table[minor] || !hidraw_table[minor]->exist) {

		ret = -ENODEV;

		goto out;