diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 18:49:28 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 18:49:28 -0200 |
| commit | 638e174688f58200d0deb7435093435e7d737b09 (patch) | |
| tree | a2cd32dbb41daf0a5d4e69eff1805fd5574c292a /security | |
| parent | 8d58d773b745950ac912e028b3c81f4902fbf91d (diff) | |
| parent | d195ea4b1456192abe780fd773778cbe9f6d77ea (diff) | |
| download | op-kernel-dev-638e174688f58200d0deb7435093435e7d737b09.zip op-kernel-dev-638e174688f58200d0deb7435093435e7d737b09.tar.gz | |
Merge branch 'origin'
Diffstat (limited to 'security')
| -rw-r--r-- | security/seclvl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/seclvl.c b/security/seclvl.c index 1caac01..8529ea6 100644 --- a/security/seclvl.c +++ b/security/seclvl.c @@ -368,8 +368,8 @@ static int seclvl_capable(struct task_struct *tsk, int cap) */ static int seclvl_settime(struct timespec *tv, struct timezone *tz) { - struct timespec now; - if (seclvl > 1) { + if (tv && seclvl > 1) { + struct timespec now; now = current_kernel_time(); if (tv->tv_sec < now.tv_sec || (tv->tv_sec == now.tv_sec && tv->tv_nsec < now.tv_nsec)) { |
