Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'char-misc-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are 3 fixes for some reported issues. Two nvmem driver fixes,
and one mei fix. All have been in linux-next just fine"
* tag 'char-misc-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
nvmem: qfprom: Specify LE device endianness
nvmem: core: return error for non word aligned access
mei: validate request value in client notify request ioctl
+12
-1
+5
-1
drivers/misc/mei/main.c
+5
-1
drivers/misc/mei/main.c
···
458
458
{
459
459
struct mei_cl *cl = file->private_data;
460
460
461
-
return mei_cl_notify_request(cl, file, request);
461
+
if (request != MEI_HBM_NOTIFICATION_START &&
462
+
request != MEI_HBM_NOTIFICATION_STOP)
463
+
return -EINVAL;
464
+
465
+
return mei_cl_notify_request(cl, file, (u8)request);
462
466
}
463
467
464
468
/**
+6
drivers/nvmem/core.c
+6
drivers/nvmem/core.c
···
70
70
if (pos >= nvmem->size)
71
71
return 0;
72
72
73
+
if (count < nvmem->word_size)
74
+
return -EINVAL;
75
+
73
76
if (pos + count > nvmem->size)
74
77
count = nvmem->size - pos;
75
78
···
97
94
/* Stop the user from writing */
98
95
if (pos >= nvmem->size)
99
96
return 0;
97
+
98
+
if (count < nvmem->word_size)
99
+
return -EINVAL;
100
100
101
101
if (pos + count > nvmem->size)
102
102
count = nvmem->size - pos;