/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1001_linux-2.6.11.2.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1001_linux-2.6.11.2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download) (as text)
Sat Jun 11 23:20:41 2005 UTC (15 years, 5 months ago) by dsd
File MIME type: text/x-diff
File size: 869 byte(s)
Create 2.6.12 branch
1 diff -Nru a/Makefile b/Makefile
2 --- a/Makefile 2005-03-09 00:13:29 -08:00
3 +++ b/Makefile 2005-03-09 00:13:29 -08:00
4 @@ -1,7 +1,7 @@
5 VERSION = 2
6 PATCHLEVEL = 6
7 SUBLEVEL = 11
8 -EXTRAVERSION = .1
9 +EXTRAVERSION = .2
10 NAME=Woozy Numbat
11
12 # *DOCUMENTATION*
13 diff -Nru a/fs/eventpoll.c b/fs/eventpoll.c
14 --- a/fs/eventpoll.c 2005-03-09 00:13:29 -08:00
15 +++ b/fs/eventpoll.c 2005-03-09 00:13:29 -08:00
16 @@ -619,6 +619,7 @@
17 return error;
18 }
19
20 +#define MAX_EVENTS (INT_MAX / sizeof(struct epoll_event))
21
22 /*
23 * Implement the event wait interface for the eventpoll file. It is the kernel
24 @@ -635,7 +636,7 @@
25 current, epfd, events, maxevents, timeout));
26
27 /* The maximum number of event must be greater than zero */
28 - if (maxevents <= 0)
29 + if (maxevents <= 0 || maxevents > MAX_EVENTS)
30 return -EINVAL;
31
32 /* Verify that the area passed by the user is writeable */

  ViewVC Help
Powered by ViewVC 1.1.20