Re: [PATCH]omap:dmtimer:no null check for kzalloc

Re: [PATCH]omap:dmtimer:no null check for kzalloc

[Artem Bityutskiy]

On Mon, 2010-07-12 at 03:39 +0530, Tarun Kanti DebBarma wrote:
> +                       if (!pdata) {
> +                               pr_err("%s: \
> +                               No memory for omap_dm_timer_plat_info\n",
> +                               __func__);
> +                               return -ENOMEM;
> +                       }

do not use concatenation ('\'), this is probably not what you want.

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH]omap:dmtimer:no null check for kzalloc

[Tarun Kanti DebBarma]

This patch incorporates null pointer check associated with memory allocation
for omap_dm_timer_plat_info using kzalloc()

Tested on OMAP4430 SDP.

Signed-off-by: Tarun Kanti Debbarma <tarun.kanti@ti.com>
--- 
 arch/arm/mach-omap2/dmtimers.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/dmtimers.c b/arch/arm/mach-omap2/dmtimers.c
index 772be63..a7e9ac5 100644
--- a/arch/arm/mach-omap2/dmtimers.c
+++ b/arch/arm/mach-omap2/dmtimers.c
@@ -248,7 +248,12 @@ void __init omap2_dm_timer_early_init(void)
 
 			pdata = kzalloc(sizeof(struct omap_dm_timer_plat_info),
 					GFP_KERNEL);
-
+			if (!pdata) {
+				pr_err("%s: \
+				No memory for omap_dm_timer_plat_info\n",
+				__func__);
+				return -ENOMEM;
+			}
 			pdata->omap_dm_clk_enable = omap2_dm_timer_enable;
 			pdata->omap_dm_clk_disable = omap2_dm_timer_disable;
 			pdata->omap_dm_set_source_clk = omap2_dm_timer_set_clk;
@@ -346,6 +351,12 @@ int __init omap2_dm_timer_init(void)
 
 			pdata = kzalloc(sizeof(struct omap_dm_timer_plat_info),
 					GFP_KERNEL);
+			if (!pdata) {
+				pr_err("%s: \
+				No memory for omap_dm_timer_plat_info\n",
+				__func__);
+				return -ENOMEM;
+			}
 			pdata->omap_dm_clk_enable = omap2_dm_timer_enable;
 			pdata->omap_dm_clk_disable = omap2_dm_timer_disable;
 			pdata->omap_dm_set_source_clk = omap2_dm_timer_set_clk;
@@ -397,7 +408,12 @@ fail:
 				break;
 			pdata = kzalloc(sizeof(struct omap_dm_timer_plat_info),
 					GFP_KERNEL);
-
+			if (!pdata) {
+				pr_err("%s: \
+				No memory for omap_dm_timer_plat_info\n",
+				__func__);
+				return -ENOMEM;
+			}
 			pdata->omap_dm_clk_enable = omap2_dm_timer_enable;
 			pdata->omap_dm_clk_disable = omap2_dm_timer_disable;
 			pdata->omap_dm_set_source_clk = omap2_dm_timer_set_clk;

RE: [PATCH]omap:dmtimer:no null check for kzalloc

[DebBarma, Tarun Kanti]

> -----Original Message-----
> From: Artem Bityutskiy [mailto:dedekind1@gmail.com]
> Sent: Sunday, July 11, 2010 11:33 PM
> To: DebBarma, Tarun Kanti
> Cc: olbpdev@list.ti.com - OMAP Linux Baseport Development Team (May
> contain non-TIers); linux-omap@vger.kernel.org
> Subject: Re: [PATCH]omap:dmtimer:no null check for kzalloc
> 
> On Mon, 2010-07-12 at 03:39 +0530, Tarun Kanti DebBarma wrote:
> > +                       if (!pdata) {
> > +                               pr_err("%s: \
> > +                               No memory for
> omap_dm_timer_plat_info\n",
> > +                               __func__);
> > +                               return -ENOMEM;
> > +                       }
> 
> do not use concatenation ('\'), this is probably not what you want.
>
Oops! Thanks for pointing this out. I will change.
 
> --
> Best Regards,
> Artem Bityutskiy (Артём Битюцкий)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html