Browse Source

nvmem: core: return error for non word aligned access

nvmem providers have restrictions on register strides, so return error
when users attempt to read/write buffers with sizes which are less
than word size.

Without this patch the userspace would continue to try as it does not
get any error from the nvmem core, resulting in a hang or endless loop
in userspace.

Reported-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Srinivas Kandagatla 10 năm trước cách đây
mục cha
commit
313a72ff98
1 tập tin đã thay đổi với 6 bổ sung0 xóa
  1. 6 0
      drivers/nvmem/core.c

+ 6 - 0
drivers/nvmem/core.c

@@ -70,6 +70,9 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
 	if (pos >= nvmem->size)
 	if (pos >= nvmem->size)
 		return 0;
 		return 0;
 
 
+	if (count < nvmem->word_size)
+		return -EINVAL;
+
 	if (pos + count > nvmem->size)
 	if (pos + count > nvmem->size)
 		count = nvmem->size - pos;
 		count = nvmem->size - pos;
 
 
@@ -95,6 +98,9 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
 	if (pos >= nvmem->size)
 	if (pos >= nvmem->size)
 		return 0;
 		return 0;
 
 
+	if (count < nvmem->word_size)
+		return -EINVAL;
+
 	if (pos + count > nvmem->size)
 	if (pos + count > nvmem->size)
 		count = nvmem->size - pos;
 		count = nvmem->size - pos;