diff options
| author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-12-07 06:13:48 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-12-07 08:39:04 -0500 |
| commit | 9ed5d5fb8b432badc967decf97e4294cbb216eef (patch) | |
| tree | d52424a1dc78796c26ae5f149c3e316784bdae37 | |
| parent | e82a34fa89f82509b5fe79b65fc351038c560a5b (diff) | |
| download | linux-9ed5d5fb8b432badc967decf97e4294cbb216eef.tar.bz2 | |
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>
| -rw-r--r-- | drivers/staging/media/sunxi/cedrus/cedrus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index 67b18231ead6..4711df7ee5a3 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -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; 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++) { struct v4l2_ctrl_config cfg = { 0 }; |