History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID fixes from Jiri Kosina: - string buffer formatting fixes in picolcd and sensor drivers, from Takashi Iwai - two new device IDs from Chen-Tsung Hsieh and Tony Fischetti * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: HID: add ALWAYS_POLL quirk to lenovo pixart mouse HID: google: add moonball USB id HID: hid-sensor-custom: Use scnprintf() for avoiding potential buffer overflow HID: hid-picolcd_fb: Use scnprintf() for avoiding potential buffer overflow

Linus Torvalds committed 6 years ago

Commit ac309e72 parents 3d135f5 819d5785 files · +10 −5Browse files

Unified · Split

5 files
  1. drivers/hid/hid-google-hammer.c +2 −0
  2. drivers/hid/hid-ids.h +2 −0
  3. drivers/hid/hid-picolcd_fb.c +2 −2
  4. drivers/hid/hid-quirks.c +1 −0
  5. drivers/hid/hid-sensor-custom.c +3 −3
drivers/hid/hid-google-hammer.c+2−0
@@ -532,6 +532,8 @@ static const struct hid_device_id hammer_devices[] = { · 531 unmodified lines
532 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MAGNEMITE) },532 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MAGNEMITE) },
533 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,533 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
534 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MASTERBALL) },534 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MASTERBALL) },
535 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
536 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MOONBALL) },
535 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,537 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
536 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) },538 USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) },
537 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,539 { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
drivers/hid/hid-ids.h+2−0
@@ -478,6 +478,7 @@ · 477 unmodified lines
478#define USB_DEVICE_ID_GOOGLE_WHISKERS 0x5030478#define USB_DEVICE_ID_GOOGLE_WHISKERS 0x5030
479#define USB_DEVICE_ID_GOOGLE_MASTERBALL 0x503c479#define USB_DEVICE_ID_GOOGLE_MASTERBALL 0x503c
480#define USB_DEVICE_ID_GOOGLE_MAGNEMITE 0x503d480#define USB_DEVICE_ID_GOOGLE_MAGNEMITE 0x503d
481#define USB_DEVICE_ID_GOOGLE_MOONBALL 0x5044
481 482
482#define USB_VENDOR_ID_GOTOP 0x08f2483#define USB_VENDOR_ID_GOTOP 0x08f2
483#define USB_DEVICE_ID_SUPER_Q2 0x007f484#define USB_DEVICE_ID_SUPER_Q2 0x007f
@@ -726,6 +727,7 @@ · 242 unmodified lines
726#define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085727#define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085
727#define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3728#define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3
728#define USB_DEVICE_ID_LENOVO_X1_TAB3 0x60b5729#define USB_DEVICE_ID_LENOVO_X1_TAB3 0x60b5
730#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D 0x608d
729 731
730#define USB_VENDOR_ID_LG 0x1fd2732#define USB_VENDOR_ID_LG 0x1fd2
731#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064733#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064
drivers/hid/hid-picolcd_fb.c+2−2
@@ -458,9 +458,9 @@ static ssize_t picolcd_fb_update_rate_show(struct device *dev, · 457 unmodified lines
458 if (ret >= PAGE_SIZE)458 if (ret >= PAGE_SIZE)
459 break;459 break;
460 else if (i == fb_update_rate)460 else if (i == fb_update_rate)
461 ret += snprintf(buf+ret, PAGE_SIZE-ret, "[%u] ", i);461 ret += scnprintf(buf+ret, PAGE_SIZE-ret, "[%u] ", i);
462 else462 else
463 ret += snprintf(buf+ret, PAGE_SIZE-ret, "%u ", i);463 ret += scnprintf(buf+ret, PAGE_SIZE-ret, "%u ", i);
464 if (ret > 0)464 if (ret > 0)
465 buf[min(ret, (size_t)PAGE_SIZE)-1] = '\n';465 buf[min(ret, (size_t)PAGE_SIZE)-1] = '\n';
466 return ret;466 return ret;
drivers/hid/hid-quirks.c+1−0
@@ -103,6 +103,7 @@ static const struct hid_device_id hid_quirks[] = { · 102 unmodified lines
103 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT },103 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT },
104 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },104 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },
105 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },105 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },
106 { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL },
106 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007), HID_QUIRK_ALWAYS_POLL },107 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007), HID_QUIRK_ALWAYS_POLL },
107 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077), HID_QUIRK_ALWAYS_POLL },108 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077), HID_QUIRK_ALWAYS_POLL },
108 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS), HID_QUIRK_NOGET },109 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS), HID_QUIRK_NOGET },
drivers/hid/hid-sensor-custom.c+3−3
@@ -313,7 +313,7 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr, · 312 unmodified lines
313 313
314 while (i < ret) {314 while (i < ret) {
315 if (i + attribute->size > ret) {315 if (i + attribute->size > ret) {
316 len += snprintf(&buf[len],316 len += scnprintf(&buf[len],
317 PAGE_SIZE - len,317 PAGE_SIZE - len,
318 "%d ", values[i]);318 "%d ", values[i]);
319 break;319 break;
@@ -336,10 +336,10 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr, · 16 unmodified lines
336 ++i;336 ++i;
337 break;337 break;
338 }338 }
339 len += snprintf(&buf[len], PAGE_SIZE - len,339 len += scnprintf(&buf[len], PAGE_SIZE - len,
340 "%lld ", value);340 "%lld ", value);
341 }341 }
342 len += snprintf(&buf[len], PAGE_SIZE - len, "\n");342 len += scnprintf(&buf[len], PAGE_SIZE - len, "\n");
343 343
344 return len;344 return len;
345 } else if (input)345 } else if (input)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t