-stable review patch. If anyone has any objections, please let us know.
------------------
Don't try to "validate" a non-existing timeval.
settime() with a NULL timeval is silly but legal.
Noticed by Dave Jones <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
[chrisw: seclvl only]
Signed-off-by: Chris Wright <[email protected]>
---
security/seclvl.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.15.3/security/seclvl.c
===================================================================
--- linux-2.6.15.3.orig/security/seclvl.c
+++ linux-2.6.15.3/security/seclvl.c
@@ -369,7 +369,7 @@ static int seclvl_capable(struct task_st
static int seclvl_settime(struct timespec *tv, struct timezone *tz)
{
struct timespec now;
- if (seclvl > 1) {
+ if (tv && seclvl > 1) {
now = current_kernel_time();
if (tv->tv_sec < now.tv_sec ||
(tv->tv_sec == now.tv_sec && tv->tv_nsec < now.tv_nsec)) {
--