From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 26 Jul 2007 16:35:09 +0000 (+0100)
Subject: misannotation in pppol2tp
X-Git-Tag: v2.6.23-rc2~243
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af3b162afd9fce69a94d79bd5b1f9c7c302212f4;p=linux-2.6-omap-h63xx.git

misannotation in pppol2tp

Address of auto variable is not a userland pointer.  A good thing, too,
since if pppol2tp_tunnel_getsockopt() would _really_ get a userland pointer
as argument, it would be an instant roothole...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index f87176055d0..266e8b38fe1 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2054,7 +2054,7 @@ end:
  */
 static int pppol2tp_tunnel_getsockopt(struct sock *sk,
 				      struct pppol2tp_tunnel *tunnel,
-				      int optname, int __user *val)
+				      int optname, int *val)
 {
 	int err = 0;
 
@@ -2077,7 +2077,7 @@ static int pppol2tp_tunnel_getsockopt(struct sock *sk,
  */
 static int pppol2tp_session_getsockopt(struct sock *sk,
 				       struct pppol2tp_session *session,
-				       int optname, int __user *val)
+				       int optname, int *val)
 {
 	int err = 0;