[PATCH 1/1] setitimer : Return -EFAULT if the user pointer "value" is NULL

From: Sasikantha babu
Date: Tue Mar 20 2012 - 10:50:10 EST


Return -EFAULT if user pointer "value" is NULL.

In the current timer implementation

setitimer (which, NULL, NULL)

is equal to

timer.it_value.tv_sec = 0;
timer.it_value.tv_usec = 0;
timer.it_interval.tv_sec = 0;
timer.it_interval.tv_usec = 0;

setitimer (which, &timer, NULL);

setitimer man page says "The function setitimer() sets the specified timer to the value in new_value".

If the new_value is NULL, kernel should not set timer with tv_sec = 0 and tv_usec = 0, instead return -EFAULT.

Signed-off-by: Sasikantha babu <sasikanth.v19@xxxxxxxxx>
---
kernel/itimer.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kernel/itimer.c b/kernel/itimer.c
index 22000c3..f356bdf 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -279,19 +279,18 @@ SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value,
struct itimerval __user *, ovalue)
{
struct itimerval set_buffer, get_buffer;
- int error;
+ int error = -EFAULT;

if (value) {
if(copy_from_user(&set_buffer, value, sizeof(set_buffer)))
return -EFAULT;
- } else
- memset((char *) &set_buffer, 0, sizeof(set_buffer));

- error = do_setitimer(which, &set_buffer, ovalue ? &get_buffer : NULL);
- if (error || !ovalue)
- return error;
+ error = do_setitimer(which, &set_buffer, ovalue ? &get_buffer : NULL);
+ if (error || !ovalue)
+ return error;

- if (copy_to_user(ovalue, &get_buffer, sizeof(get_buffer)))
- return -EFAULT;
- return 0;
+ if (copy_to_user(ovalue, &get_buffer, sizeof(get_buffer)))
+ return -EFAULT;
+ }
+ return error;
}
--
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/