Commit e919b86c authored Jun 03, 2013 by Dan Carpenter Committed by Greg Kroah-Hartman Jun 03, 2013

staging: alarm-dev: information leak in alarm_ioctl()



Smatch complains that if we pass an invalid clock type then "ts" is
never set.  We need to check for errors earlier, otherwise we end up
passing uninitialized stack data to userspace.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 76554b87

drivers/staging/android/alarm-dev.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -264,6 +264,8 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		}

		rv = alarm_do_ioctl(file, cmd, &ts);
		if (rv)
		return rv;

		switch (ANDROID_ALARM_BASE_CMD(cmd)) {
		case ANDROID_ALARM_GET_TIME(0):
		@@ -272,7 +274,7 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		break;
		}

		return rv;
		return 0;
		}
		#ifdef CONFIG_COMPAT
		static long alarm_compat_ioctl(struct file *file, unsigned int cmd,