diff options
| author | Vasiliy Kulikov <segoon@openwall.com> | 2011-01-19 15:57:22 +0300 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-03-10 03:15:50 +0300 |
| commit | 5c56f32e80ac8ea9878a0a5eb9ca99c703e953ab (patch) | |
| tree | 043d51774b936a9b5e46a7da4dc65c2617ed1fcd /arch/arm/mach-omap2/smartreflex.c | |
| parent | 8743410d4971c5510a7d09293f5f3f89d8081059 (diff) | |
| download | linux-5c56f32e80ac8ea9878a0a5eb9ca99c703e953ab.tar.xz | |
OMAP: PM: SmartReflex: fix potential NULL dereference
kzalloc() may fail, if so return -ENOMEM. Also Walter Harms suggested
to use kasprintf() instead of kzalloc+strcpy+strcat.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex.c')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 1a777e34d0c2..b57ae502e0c7 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -260,9 +260,11 @@ static int sr_late_init(struct omap_sr *sr_info) if (sr_class->class_type == SR_CLASS2 && sr_class->notify_flags && sr_info->irq) { - name = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL); - strcpy(name, "sr_"); - strcat(name, sr_info->voltdm->name); + name = kasprintf(GFP_KERNEL, "sr_%s", sr_info->voltdm->name); + if (name == NULL) { + ret = -ENOMEM; + goto error; + } ret = request_irq(sr_info->irq, sr_interrupt, 0, name, (void *)sr_info); if (ret) |