Received: by 10.192.165.148 with SMTP id m20csp794439imm; Fri, 27 Apr 2018 07:37:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrY396meNHrCkkOLOvs/lN31VMs4KPYs/trocK4Y6XVCVlMSenBcHJJjOiYied4dLippgAR X-Received: by 2002:a17:902:9686:: with SMTP id n6-v6mr2503518plp.136.1524839870858; Fri, 27 Apr 2018 07:37:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524839870; cv=none; d=google.com; s=arc-20160816; b=ol/FkpRTv22FrwlDAWHpBAsrnAzYsFlLkKrfPoXvixrhmviMueUkiXwAQJpUPxJEW5 kd44mkQWotIp227ws6onji4HEX05O4J0TSWxTOuBhewtdQ2aMFv6BDMF9f28aovO+qrj BaCoQdFMqghRe4e8LXzuny/2Prva0TmeNG8ijAnn9jIc8mDtCXg5nLpUvMTCChdTcJrf 2aAVX9y/sAF6+fZEqO6qxcA3fcjnWq3JnnwfQcozQd/PG0m09zjRb7e4Chrn5dD0VrnO YOOjm4d9Wh6SBdRXFTsP4A5xNCgFaUY2KbwbX0p2aQJUYiCtLHTizBLhW/RpWlbMc3LR 8Qzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dmarc-filter :arc-authentication-results; bh=qqUtIPv9LuACxoLC2IPVWo2XUYbnpn9D7oVqXXOcZVM=; b=NwwJoJj6ud3w5La9h7D2mgIpAsZzbR3OPkE4MNnfsZfcAjOkvq/Nr6d9DjeNKn8Zlh gfJ2UrOADUwcVe3C9TNpIyB8gBCjgT5DVeaHf+6ty+slBjPUN5bY+pexvJyI9xkcKLw/ lTu3Fq2KnyJ//zBDNuyJkQJFLVUAMxeumPJ2c9DXmgRDKnZUnlul5uqjGJnKF43gqUYa X8IQZ/2QXbR78972avp7fREBpuqHIwNf8GhEpQmM0sDDEgBvC9nim8IoSn2KBt/xuOYd Zeca0yl3e+DZRqzI70FuBrwxlTRmVO3LXfGvyGAAAh6IdBP+0pp5VgCz19Ljz2k6b1+s lLTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y139si1404373pfc.163.2018.04.27.07.37.36; Fri, 27 Apr 2018 07:37:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934731AbeD0OJp (ORCPT + 99 others); Fri, 27 Apr 2018 10:09:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:55016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934720AbeD0OJn (ORCPT ); Fri, 27 Apr 2018 10:09:43 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BD710218CA; Fri, 27 Apr 2018 14:09:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD710218CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+a70ac890b23b1bf29f5c@syzkaller.appspotmail.com, Guillaume Nault , "David S. Miller" Subject: [PATCH 4.16 13/81] l2tp: check sockaddr length in pppol2tp_connect() Date: Fri, 27 Apr 2018 15:58:15 +0200 Message-Id: <20180427135744.015355719@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135743.216853156@linuxfoundation.org> References: <20180427135743.216853156@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Guillaume Nault [ Upstream commit eb1c28c05894a4b1f6b56c5bf072205e64cfa280 ] Check sockaddr_len before dereferencing sp->sa_protocol, to ensure that it actually points to valid data. Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts") Reported-by: syzbot+a70ac890b23b1bf29f5c@syzkaller.appspotmail.com Signed-off-by: Guillaume Nault Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/l2tp/l2tp_ppp.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -619,6 +619,13 @@ static int pppol2tp_connect(struct socke lock_sock(sk); error = -EINVAL; + + if (sockaddr_len != sizeof(struct sockaddr_pppol2tp) && + sockaddr_len != sizeof(struct sockaddr_pppol2tpv3) && + sockaddr_len != sizeof(struct sockaddr_pppol2tpin6) && + sockaddr_len != sizeof(struct sockaddr_pppol2tpv3in6)) + goto end; + if (sp->sa_protocol != PX_PROTO_OL2TP) goto end;