Received: by 10.192.165.148 with SMTP id m20csp749118imm; Fri, 27 Apr 2018 06:59:39 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpdp7si5vORtT/SDjXpCgST1wM4/Ix1VYPGfzgiglWNjyscWc8XDnILy18v7Z1/N1muHUh4 X-Received: by 2002:a17:902:8ec4:: with SMTP id x4-v6mr2393397plo.370.1524837579145; Fri, 27 Apr 2018 06:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524837579; cv=none; d=google.com; s=arc-20160816; b=zhXi4DW7SU59SrprLt0d/JQ6Ebbbfb3NFVfZSWQRZoXAG37aknilpdlAzmPyIZWtRT 7eKde4ta9Z1PwxVjTk08xBUup1mtt/n4PFOCaZwNhGyFkouqfQ86eSrhCmNw/g+SDTkC RRUmDcaxzDn/eDhAZ2Qg6lYF6IzxMFxzvy7L8HVcfcGbeexOK5RUGFF0SCscHx6bI3Uw iUZ9oDzdzK04IHlE5GwncoY/RgApdOj4bNh84XOJq5CaMB40oo/ukL/tyNDpv//ysypX iJdSTCiKNHm4SdMBcZcWj36kDp8CR83v3B+f9qPLrYCUzBIYUFJ0aALozpZva34a9VHH mwrw== 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=0DxIiDVNi4FVDATBAPzmxAzj2Mjyqm0jm2YwnETC3uM=; b=U67mURIvJUDOSqroCA+5kvLvQGBkBRljyB7r23p3M3F46HX8gmoA9MjThLrPXA7qup wx4xMd3ojvk4WgkM/Lg+BF51HLMu+44bLLFtMoDQX79PbW2zE/odceUb3nGBPmxL766H I25bIBwsZ8Jx6sKhPWOdCnvJDRh1mg59b7VObXCM/KXQMG/X8KeKLZQJz50nJQqOBgAK EUwWYMQDpO3TK2pf68rNe8QBe1Z3cebdp2qJfPMrTYn3Aqs2dMJyBKf0o0rExelZbyMs /Mm7F7fDDZXDNR2pAwhFUW6HWHO8Ff14cbCLG23f0H9gXngebAvO9RHJblUtDph1NwuN zrjQ== 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 q1-v6si1317374pga.417.2018.04.27.06.59.24; Fri, 27 Apr 2018 06:59:39 -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 S932868AbeD0N6Z (ORCPT + 99 others); Fri, 27 Apr 2018 09:58:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:46588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932857AbeD0N6W (ORCPT ); Fri, 27 Apr 2018 09:58:22 -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 A385521896; Fri, 27 Apr 2018 13:58:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A385521896 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 3.18 11/24] l2tp: check sockaddr length in pppol2tp_connect() Date: Fri, 27 Apr 2018 15:57:46 +0200 Message-Id: <20180427135632.041456906@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135631.584839868@linuxfoundation.org> References: <20180427135631.584839868@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 3.18-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 @@ -608,6 +608,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;