* [PATCH][next] media: allegro: fix potential null dereference on header
@ 2020-07-20 16:38 Colin King
2020-07-22 13:00 ` Michael Tretter
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2020-07-20 16:38 UTC (permalink / raw)
To: Michael Tretter, Pengutronix Kernel Team, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Hans Verkuil, linux-media, devel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The pointer header is an alias to msg and msg is being null checked.
However, if msg is null then header is also null and this can lead to
a null pointer dereference on the assignment type = header->type. Fix
this by only dereferencing header after the null check on msg.
Addresses-Coverity: ("Dereference before null check")
Fixes: 3de16839669f ("media: allegro: add explicit mail encoding and decoding")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/staging/media/allegro-dvt/allegro-mail.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/allegro-dvt/allegro-mail.c b/drivers/staging/media/allegro-dvt/allegro-mail.c
index 4ac65de12463..4496e2a4da5c 100644
--- a/drivers/staging/media/allegro-dvt/allegro-mail.c
+++ b/drivers/staging/media/allegro-dvt/allegro-mail.c
@@ -462,12 +462,14 @@ allegro_dec_encode_frame(struct mcu_msg_encode_frame_response *msg, u32 *src)
ssize_t allegro_encode_mail(u32 *dst, void *msg)
{
const struct mcu_msg_header *header = msg;
- enum mcu_msg_type type = header->type;
+ enum mcu_msg_type type;
ssize_t size;
if (!msg || !dst)
return -EINVAL;
+ type = header->type;
+
switch (type) {
case MCU_MSG_TYPE_INIT:
size = allegro_enc_init(&dst[1], msg);
--
2.27.0
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] media: allegro: fix potential null dereference on header
2020-07-20 16:38 [PATCH][next] media: allegro: fix potential null dereference on header Colin King
@ 2020-07-22 13:00 ` Michael Tretter
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tretter @ 2020-07-22 13:00 UTC (permalink / raw)
To: Colin King
Cc: devel, Greg Kroah-Hartman, kernel-janitors, linux-kernel,
Pengutronix Kernel Team, Hans Verkuil, Mauro Carvalho Chehab,
linux-media
On Mon, 20 Jul 2020 17:38:04 +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The pointer header is an alias to msg and msg is being null checked.
> However, if msg is null then header is also null and this can lead to
> a null pointer dereference on the assignment type = header->type. Fix
> this by only dereferencing header after the null check on msg.
>
> Addresses-Coverity: ("Dereference before null check")
> Fixes: 3de16839669f ("media: allegro: add explicit mail encoding and decoding")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/staging/media/allegro-dvt/allegro-mail.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/allegro-dvt/allegro-mail.c b/drivers/staging/media/allegro-dvt/allegro-mail.c
> index 4ac65de12463..4496e2a4da5c 100644
> --- a/drivers/staging/media/allegro-dvt/allegro-mail.c
> +++ b/drivers/staging/media/allegro-dvt/allegro-mail.c
> @@ -462,12 +462,14 @@ allegro_dec_encode_frame(struct mcu_msg_encode_frame_response *msg, u32 *src)
> ssize_t allegro_encode_mail(u32 *dst, void *msg)
> {
> const struct mcu_msg_header *header = msg;
> - enum mcu_msg_type type = header->type;
> + enum mcu_msg_type type;
> ssize_t size;
>
> if (!msg || !dst)
> return -EINVAL;
>
> + type = header->type;
type is only used in the switch statement right below the assignment. Thus,
you could remove the local variable and directly use header->type in the
switch.
Michael
> +
> switch (type) {
> case MCU_MSG_TYPE_INIT:
> size = allegro_enc_init(&dst[1], msg);
> --
> 2.27.0
>
>
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-22 13:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20 16:38 [PATCH][next] media: allegro: fix potential null dereference on header Colin King
2020-07-22 13:00 ` Michael Tretter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).