diff options
| author | Lily Li <lali@codeaurora.org> | 2019-08-26 14:45:42 +0800 |
|---|---|---|
| committer | Bo Fang <bofang1@codeaurora.org> | 2019-12-03 14:56:04 +0800 |
| commit | 4bbb2def1d83ff9fb09691bce13cac509f97e0e6 (patch) | |
| tree | 1be88469f4b64f1163922024f4724b3b67912c4d /drivers | |
| parent | fbbb7d9af6faf01b3fe05f9a91d1a0b56049fc0a (diff) | |
media: v4l2loopback: fix for dereferenced error
Found the code hasn't check whether some var is NULL before
using it in v4l2loopback. Fix those issues.
Change-Id: I559ed8c0978cf478ed713761b7bc7e3b21c09ff4
Signed-off-by: Lily Li <lali@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/v4l2loopback-master/v4l2loopback.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/v4l2loopback-master/v4l2loopback.c b/drivers/media/v4l2loopback-master/v4l2loopback.c index f8ade92b9407..b6e7f6a2a768 100644 --- a/drivers/media/v4l2loopback-master/v4l2loopback.c +++ b/drivers/media/v4l2loopback-master/v4l2loopback.c @@ -483,6 +483,8 @@ static ssize_t attr_store_format(struct device *cd, struct v4l2_loopback_device *dev = v4l2loopback_cd2dev(cd); int fps_num = 0, fps_den = 1; + if (!dev) + return -EINVAL; /* only fps changing is supported */ if (sscanf(buf, "@%d/%d", &fps_num, &fps_den) > 0) { struct v4l2_fract f = { @@ -490,7 +492,6 @@ static ssize_t attr_store_format(struct device *cd, .denominator = fps_num }; int err = 0; - err = set_timeperframe(dev, &f); if (err < 0) return err; @@ -671,7 +672,7 @@ static inline void unset_flags(struct v4l2l_buffer *buffer) static void vidioc_fill_name(char *buf, int len, int nr) { if (card_label[nr] != NULL) - snprintf(buf, len, card_label[nr]); + snprintf(buf, len, "%s\n", card_label[nr]); else snprintf(buf, len, "Dummy video device (0x%04X)", nr); } @@ -1909,7 +1910,7 @@ static int v4l2_loopback_mmap(struct file *file, struct vm_area_struct *vma) page = (void *)vmalloc_to_page((void *)addr); - if (vm_insert_page(vma, start, page) < 0) + if (!page || vm_insert_page(vma, start, page) < 0) return -EAGAIN; start += PAGE_SIZE; |