/[linux-patches]/genpatches-2.6/trunk/2.6.14/1419_15.4_seclvl-settime.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1419_15.4_seclvl-settime.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 8 months ago) by johnm
File MIME type: text/x-diff
File size: 1066 byte(s)
2.6.14-11, rebase against local tree
1 From stable-bounces@linux.kernel.org Tue Jan 31 21:27:10 2006
2 Date: Tue, 31 Jan 2006 21:20:26 -0800
3 From: Linus Torvalds <torvalds@osdl.org>
4 To: stable@kernel.org
5 Cc:
6 Subject: seclvl settime fix
7
8 Don't try to "validate" a non-existing timeval.
9
10 settime() with a NULL timeval is silly but legal.
11
12 Noticed by Dave Jones <davej@redhat.com>
13
14 Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 [chrisw: seclvl only]
16 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
17 ---
18
19 security/seclvl.c | 2 +-
20 1 files changed, 1 insertion(+), 1 deletion(-)
21
22 Index: linux-2.6.15.2/security/seclvl.c
23 ===================================================================
24 --- linux-2.6.15.2.orig/security/seclvl.c
25 +++ linux-2.6.15.2/security/seclvl.c
26 @@ -369,7 +369,7 @@ static int seclvl_capable(struct task_st
27 static int seclvl_settime(struct timespec *tv, struct timezone *tz)
28 {
29 struct timespec now;
30 - if (seclvl > 1) {
31 + if (tv && seclvl > 1) {
32 now = current_kernel_time();
33 if (tv->tv_sec < now.tv_sec ||
34 (tv->tv_sec == now.tv_sec && tv->tv_nsec < now.tv_nsec)) {

  ViewVC Help
Powered by ViewVC 1.1.20