2015-02-11 09:37:58

by Kiran Padwal

[permalink] [raw]

Subject: [PATCH] video: ARM CLCD: Add missing error check for devm_kzalloc

---

This patch add a missing check on the return value of devm_kzalloc,
which would cause a NULL pointer dereference in a OOM situation.

Signed-off-by: Kiran Padwal <[email protected]>
---
drivers/video/fbdev/amba-clcd.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
index 32c0b6b..9362424 100644
--- a/drivers/video/fbdev/amba-clcd.c
+++ b/drivers/video/fbdev/amba-clcd.c
@@ -599,6 +599,9 @@ static int clcdfb_of_get_mode(struct device *dev, struct device_node *endpoint,

len = clcdfb_snprintf_mode(NULL, 0, mode);
name = devm_kzalloc(dev, len + 1, GFP_KERNEL);
+ if (!name)
+ return -ENOMEM;
+
clcdfb_snprintf_mode(name, len + 1, mode);
mode->name = name;

--
1.7.9.5

2015-02-20 12:12:30

by Tomi Valkeinen

[permalink] [raw]

Subject: Re: [PATCH] video: ARM CLCD: Add missing error check for devm_kzalloc

---

On 11/02/15 11:36, Kiran Padwal wrote:
> This patch add a missing check on the return value of devm_kzalloc,
> which would cause a NULL pointer dereference in a OOM situation.
>
> Signed-off-by: Kiran Padwal <[email protected]>
> ---
> drivers/video/fbdev/amba-clcd.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
> index 32c0b6b..9362424 100644
> --- a/drivers/video/fbdev/amba-clcd.c
> +++ b/drivers/video/fbdev/amba-clcd.c
> @@ -599,6 +599,9 @@ static int clcdfb_of_get_mode(struct device *dev, struct device_node *endpoint,
>
> len = clcdfb_snprintf_mode(NULL, 0, mode);
> name = devm_kzalloc(dev, len + 1, GFP_KERNEL);
> + if (!name)
> + return -ENOMEM;
> +
> clcdfb_snprintf_mode(name, len + 1, mode);
> mode->name = name;
>
>

Thanks, queued for 3.20.

Tomi

---

Attachments:

signature.asc (819.00 B)
OpenPGP digital signature