lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 196/211] pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
    Date
    4.2.8-ckt1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: WANG Cong <xiyou.wangcong@gmail.com>

    [ 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: Kamal Mostafa <kamal@canonical.com>
    ---
    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 686f37d..b910cae 100644
    --- a/drivers/net/ppp/pptp.c
    +++ b/drivers/net/ppp/pptp.c
    @@ -418,6 +418,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;
    @@ -439,6 +442,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;

    --
    1.9.1


    \
     
     \ /
      Last update: 2016-01-05 21:21    [W:2.859 / U:1.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site