mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
media: cetrus: return an error if alloc fails
As warned by smatch: drivers/staging/media/sunxi/cedrus/cedrus.c: drivers/staging/media/sunxi/cedrus/cedrus.c:93 cedrus_init_ctrls() error: potential null dereference 'ctx->ctrls'. (kzalloc returns null) While here, remove the memset(), as kzalloc() already zeroes the struct. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
e82a34fa89
commit
9ed5d5fb8b
1 changed files with 2 additions and 1 deletions
|
@ -72,7 +72,8 @@ static int cedrus_init_ctrls(struct cedrus_dev *dev, struct cedrus_ctx *ctx)
|
||||||
ctrl_size = sizeof(ctrl) * CEDRUS_CONTROLS_COUNT + 1;
|
ctrl_size = sizeof(ctrl) * CEDRUS_CONTROLS_COUNT + 1;
|
||||||
|
|
||||||
ctx->ctrls = kzalloc(ctrl_size, GFP_KERNEL);
|
ctx->ctrls = kzalloc(ctrl_size, GFP_KERNEL);
|
||||||
memset(ctx->ctrls, 0, ctrl_size);
|
if (!ctx->ctrls)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
for (i = 0; i < CEDRUS_CONTROLS_COUNT; i++) {
|
for (i = 0; i < CEDRUS_CONTROLS_COUNT; i++) {
|
||||||
struct v4l2_ctrl_config cfg = { 0 };
|
struct v4l2_ctrl_config cfg = { 0 };
|
||||||
|
|
Loading…
Reference in a new issue