diff options
| author | ZhengShunQian <zhengsq@rock-chips.com> | 2015-09-30 08:33:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 07:09:43 -0400 |
| commit | 7c806883e143dc60439e6bdb3589700ebed1efaa (patch) | |
| tree | 1c0b21a959e88862b3179c2515975ed8e6319f5c /drivers/nvmem/core.c | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
nvmem: core: fix the out-of-range leak in read/write()
The position to read/write must be less than max
register size.
Signed-off-by: ZhengShunQian <zhengsq@rock-chips.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvmem/core.c')
| -rw-r--r-- | drivers/nvmem/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index d3c6676b3c0c..f4af8e5fcd94 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c | |||
| @@ -67,7 +67,7 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj, | |||
| 67 | int rc; | 67 | int rc; |
| 68 | 68 | ||
| 69 | /* Stop the user from reading */ | 69 | /* Stop the user from reading */ |
| 70 | if (pos > nvmem->size) | 70 | if (pos >= nvmem->size) |
| 71 | return 0; | 71 | return 0; |
| 72 | 72 | ||
| 73 | if (pos + count > nvmem->size) | 73 | if (pos + count > nvmem->size) |
| @@ -92,7 +92,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj, | |||
| 92 | int rc; | 92 | int rc; |
| 93 | 93 | ||
| 94 | /* Stop the user from writing */ | 94 | /* Stop the user from writing */ |
| 95 | if (pos > nvmem->size) | 95 | if (pos >= nvmem->size) |
| 96 | return 0; | 96 | return 0; |
| 97 | 97 | ||
| 98 | if (pos + count > nvmem->size) | 98 | if (pos + count > nvmem->size) |