diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-16 23:00:36 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-16 23:00:36 +0000 |
| commit | 14dd2ec093cfabda3ae7efeeaf0e23c66ebaccc0 (patch) | |
| tree | 9a9ce5cff6ef92faa6e07a82785b9a6d6838f7e4 /fs/fcntl.c | |
| parent | 847290510f811c572cc2aa80c1f02a04721410b1 (diff) | |
Merge with 2.4.0-test1.
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index d6cebd646..ab758c566 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -259,8 +259,7 @@ out: /* Table to convert sigio signal codes into poll band bitmaps */ -static long band_table[NSIGPOLL+1] = { - ~0, +static long band_table[NSIGPOLL] = { POLLIN | POLLRDNORM, /* POLL_IN */ POLLOUT | POLLWRNORM | POLLWRBAND, /* POLL_OUT */ POLLIN | POLLRDNORM | POLLMSG, /* POLL_MSG */ @@ -290,10 +289,15 @@ static void send_sigio_to_task(struct task_struct *p, si.si_signo = fown->signum; si.si_errno = 0; si.si_code = reason; - if (reason < 0 || reason > NSIGPOLL) + /* Make sure we are called with one of the POLL_* + reasons, otherwise we could leak kernel stack into + userspace. */ + if ((reason & __SI_MASK) != __SI_POLL) + BUG(); + if (reason - POLL_IN > NSIGPOLL) si.si_band = ~0L; else - si.si_band = band_table[reason]; + si.si_band = band_table[reason - POLL_IN]; si.si_fd = fa->fa_fd; if (!send_sig_info(fown->signum, &si, p)) break; |