diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-12-31 14:30:23 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-12-31 15:16:33 +0000 |
| commit | 7dbea86ac6d1cc87bf497ecefa083787a5ee84c1 (patch) | |
| tree | 94ed508981b4683c0a61ace3609ed299c38ecdce /main/linux-grsec/pptp-verify-sockaddr_len.patch | |
| parent | 1ea05c13c66c6cf58724e7a68474a0421fc26235 (diff) | |
| download | aports-7dbea86ac6d1cc87bf497ecefa083787a5ee84c1.tar.bz2 aports-7dbea86ac6d1cc87bf497ecefa083787a5ee84c1.tar.xz | |
main/linux-grsec: security fixes
Diffstat (limited to 'main/linux-grsec/pptp-verify-sockaddr_len.patch')
| -rw-r--r-- | main/linux-grsec/pptp-verify-sockaddr_len.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/main/linux-grsec/pptp-verify-sockaddr_len.patch b/main/linux-grsec/pptp-verify-sockaddr_len.patch new file mode 100644 index 0000000000..0f9c1ec3b3 --- /dev/null +++ b/main/linux-grsec/pptp-verify-sockaddr_len.patch @@ -0,0 +1,39 @@ +From 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 Mon Sep 17 00:00:00 2001 +From: WANG Cong <xiyou.wangcong@gmail.com> +Date: Mon, 14 Dec 2015 13:48:36 -0800 +Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect() + +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> +--- + drivers/net/ppp/pptp.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c +index fc69e41..597c53e 100644 +--- a/drivers/net/ppp/pptp.c ++++ b/drivers/net/ppp/pptp.c +@@ -419,6 +419,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; +@@ -440,6 +443,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; + +-- +cgit v0.11.2 + |