[PATCH 04/23] seclvl settime fix

From: Chris Wright
Date: Wed Feb 08 2006 - 01:40:42 EST


-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 <davej@xxxxxxxxxx>

Signed-off-by: Linus Torvalds <torvalds@xxxxxxxx>
[chrisw: seclvl only]
Signed-off-by: Chris Wright <chrisw@xxxxxxxxxxxx>
---

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)) {

--
-
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/