projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b6f957
)
pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
author
WANG Cong
<xiyou.wangcong@gmail.com>
Mon, 14 Dec 2015 21:48:36 +0000
(13:48 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 23 Jan 2016 04:34:55 +0000
(20:34 -0800)
[ Upstream commit
09ccfd238e5a0e670d8178cf50180ea81ae09ae1
]
Reported-by: Dmitry Vyukov <dvyukov@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ppp/pptp.c
patch
|
blob
|
history
diff --git
a/drivers/net/ppp/pptp.c
b/drivers/net/ppp/pptp.c
index 1dc628ffce2b52a565354f060dca84467d67e4b9..0710214df2bfa28585ecf84c3abc5e68cc346c37 100644
(file)
--- a/
drivers/net/ppp/pptp.c
+++ b/
drivers/net/ppp/pptp.c
@@
-420,6
+420,9
@@
static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
struct pptp_opt *opt = &po->proto.pptp;
int error = 0;
+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
+ return -EINVAL;
+
lock_sock(sk);
opt->src_addr = sp->sa_addr.pptp;
@@
-441,6
+444,9
@@
static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
struct flowi4 fl4;
int error = 0;
+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
+ return -EINVAL;
+
if (sp->sa_protocol != PX_PROTO_PPTP)
return -EINVAL;