diff options
| author | Linus Torvalds <[email protected]> | 2021-08-15 04:59:53 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-08-15 04:59:53 +0000 |
| commit | 76c9e465dd529cfe1e49ed975563fa0c44aa2bdc (patch) | |
| tree | 9c73d547335468d45b39c6388c3c31a9836dac89 /drivers/i2c/i2c-dev.c | |
| parent | Merge tag 'for-linus-5.14-rc6-tag' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | Documentation: i2c: add i2c-sysfs into index (diff) | |
| download | kernel-76c9e465dd529cfe1e49ed975563fa0c44aa2bdc.tar.gz kernel-76c9e465dd529cfe1e49ed975563fa0c44aa2bdc.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"One driver bugfix, a documentation bugfix, and an "uninitialized data"
leak fix for the core"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
Documentation: i2c: add i2c-sysfs into index
i2c: dev: zero out array used for i2c reads from userspace
i2c: iproc: fix race between client unreg and tasklet
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index cb64fe649390..77f576e51652 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -141,7 +141,7 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count, if (count > 8192) count = 8192; - tmp = kmalloc(count, GFP_KERNEL); + tmp = kzalloc(count, GFP_KERNEL); if (tmp == NULL) return -ENOMEM; @@ -150,7 +150,8 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count, ret = i2c_master_recv(client, tmp, count); if (ret >= 0) - ret = copy_to_user(buf, tmp, count) ? -EFAULT : ret; + if (copy_to_user(buf, tmp, ret)) + ret = -EFAULT; kfree(tmp); return ret; } |