Commit 313a72ff authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Greg Kroah-Hartman

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: default avatarAriel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c7e4fe3
...@@ -70,6 +70,9 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment