mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
media: atomisp: fix "variable dereferenced before check 'asd'"
[ Upstream commit ac56760a8b
]
There are two occurrences where the variable 'asd' is dereferenced
before check. Fix this issue by using the variable after the check.
Link: https://lore.kernel.org/linux-media/20211122074122.GA6581@kili/
Link: https://lore.kernel.org/linux-media/20211201141904.47231-1-kitakar@gmail.com
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a2e962b2d8
commit
6aaff2d7c9
2 changed files with 4 additions and 2 deletions
|
@ -5224,7 +5224,7 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,
|
|||
int (*configure_pp_input)(struct atomisp_sub_device *asd,
|
||||
unsigned int width, unsigned int height) =
|
||||
configure_pp_input_nop;
|
||||
u16 stream_index = atomisp_source_pad_to_stream_id(asd, source_pad);
|
||||
u16 stream_index;
|
||||
const struct atomisp_in_fmt_conv *fc;
|
||||
int ret, i;
|
||||
|
||||
|
@ -5233,6 +5233,7 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,
|
|||
__func__, vdev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
stream_index = atomisp_source_pad_to_stream_id(asd, source_pad);
|
||||
|
||||
v4l2_fh_init(&fh.vfh, vdev);
|
||||
|
||||
|
|
|
@ -1123,7 +1123,7 @@ int __atomisp_reqbufs(struct file *file, void *fh,
|
|||
struct ia_css_frame *frame;
|
||||
struct videobuf_vmalloc_memory *vm_mem;
|
||||
u16 source_pad = atomisp_subdev_source_pad(vdev);
|
||||
u16 stream_id = atomisp_source_pad_to_stream_id(asd, source_pad);
|
||||
u16 stream_id;
|
||||
int ret = 0, i = 0;
|
||||
|
||||
if (!asd) {
|
||||
|
@ -1131,6 +1131,7 @@ int __atomisp_reqbufs(struct file *file, void *fh,
|
|||
__func__, vdev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
stream_id = atomisp_source_pad_to_stream_id(asd, source_pad);
|
||||
|
||||
if (req->count == 0) {
|
||||
mutex_lock(&pipe->capq.vb_lock);
|
||||
|
|
Loading…
Reference in a new issue