Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c56f32e authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Kevin Hilman
Browse files

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: default avatarVasiliy Kulikov <segoon@openwall.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 8743410d

arch/arm/mach-omap2/smartreflex.c

+5 −3
Original line number Diff line number Diff line
@@ -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)