From 42583864fd0d527a014383a0a326fd70dd794deb Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 23 Nov 2007 15:21:11 -0500 Subject: [PATCH] Import 2.2.15pre20 --- Makefile | 2 +- drivers/char/pty.c | 1 + net/sunrpc/svcauth.c | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8e63a7c2d0c8..99d7e8e4ed65 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 2 SUBLEVEL = 15 -EXTRAVERSION = pre19 +EXTRAVERSION = pre20 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 80b073986e95..a1320fc69932 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c @@ -121,6 +121,7 @@ static void pty_unthrottle(struct tty_struct * tty) o_tty->ldisc.write_wakeup) (o_tty->ldisc.write_wakeup)(o_tty); wake_up_interruptible(&o_tty->write_wait); + wake_up_interruptible(&o_tty->poll_wait); set_bit(TTY_THROTTLED, &tty->flags); } diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c index 660dbbb95823..3f740c26c306 100644 --- a/net/sunrpc/svcauth.c +++ b/net/sunrpc/svcauth.c @@ -4,6 +4,9 @@ * The generic interface for RPC authentication on the server side. * * Copyright (C) 1995, 1996 Olaf Kirch + * + * CHANGES + * 19-Apr-2000 Chris Evans - Security fix */ #include @@ -117,7 +120,8 @@ svcauth_unix(struct svc_rqst *rqstp, u32 *statp, u32 *authp) struct svc_buf *resp = &rqstp->rq_resbuf; struct svc_cred *cred = &rqstp->rq_cred; u32 *bufp = argp->buf; - int len = argp->len, slen, i; + int len = argp->len; + u32 slen, i; if ((len -= 3) < 0) { *statp = rpc_garbage_args; @@ -127,7 +131,7 @@ svcauth_unix(struct svc_rqst *rqstp, u32 *statp, u32 *authp) bufp++; /* length */ bufp++; /* time stamp */ slen = (ntohl(*bufp++) + 3) >> 2; /* machname length */ - if (slen > 64 || (len -= slen) < 0) + if (slen > 64 || (len -= slen + 3) < 0) goto badcred; bufp += slen; /* skip machname */ -- 2.39.5