Commit 60bba385 authored Jun 04, 2013 by Dan Carpenter Committed by Greg Kroah-Hartman Jun 04, 2013

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



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.

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

parent e919b86c

drivers/staging/android/alarm-dev.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -297,6 +297,8 @@ static long alarm_compat_ioctl(struct file *file, unsigned int cmd,
		}

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

		switch (ANDROID_ALARM_BASE_CMD(cmd)) {
		case ANDROID_ALARM_GET_TIME(0): /* NOTE: we modified cmd above */
		@@ -305,7 +307,7 @@ static long alarm_compat_ioctl(struct file *file, unsigned int cmd,
		break;
		}

		return rv;
		return 0;
		}
		#endif