Received: by 10.192.165.148 with SMTP id m20csp815151imm; Fri, 27 Apr 2018 07:59:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoOmFagYIgc3Kd6cfiRgRASa0n+5s7xaSotWhQLioGZBWOMx8UP6ifII+PSCbqzpWONpLt7 X-Received: by 2002:a63:7b0f:: with SMTP id w15-v6mr2313485pgc.405.1524841148921; Fri, 27 Apr 2018 07:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524841148; cv=none; d=google.com; s=arc-20160816; b=vUXRdeXFFIy70tx30BL2ZXRsUUuxsVZ5/wrw4ME8zWugiDEkdAU0lcUJm0+/FRDDLc NvLCzbfc06cPq2T1VfESHtV65otRqm3Cv8uzVA9cMux2jBaG3gmQ5ejyuh9bOAjN67HW MjIPEkbDTn0hHgkjiAW/eUMzReIRsYfORmzRpkq7b6GvFg2Q1Y9c3JUCeQ0IaGDBKAtM 7Yf6v/idrhShyuD07hDg90xiHz6jIwzMKlCFe3e/niLYJ8xnrRHw5Yk1hpbAazf5UT+9 2A360tyevQKARcsNQHVNqoxiwkQeRnGN7PwN/cjgoix13DgDGk3u6Y1wY84c51evp779 ooYQ== 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=DLU1G+OT2w0tnmfZiUXZZHQLo9xzJmR2qgReVvX1ROg=; b=0CmseZR798ZmVi5gDgKo0l+Qzp49oVYIHajrly/V7WWwZCGqJBuinEQ9LQ3cuDJ3Aa Op4ClSEp20wYLdluvbgneDF//yMdiXWnVALqHily4lQS5/k2/vXl/J/kQBRmrS6ALGHv KeDejXyKB2PP+5O3gQVuRchi1IXfDAAcIWljFIhafDyqVtF7e7czwVTVGm8RrxrpBfA7 GHVAuKJxQsnm/Hw/dsIv9r7exm6dr90d6tStkYnmSKVX2UBcdWFqul9iDZ24OtB8KR5W sGK2nDmIVwkYUM5n09h66KCifN2sfEBsRBA1pBEDKIfb20dKyfMUMYJff980M5HKi9QN Xt+g== 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 q15-v6si1338417pgc.303.2018.04.27.07.58.54; Fri, 27 Apr 2018 07:59:08 -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 S934182AbeD0O5x (ORCPT + 99 others); Fri, 27 Apr 2018 10:57:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:52212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934002AbeD0OGJ (ORCPT ); Fri, 27 Apr 2018 10:06:09 -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 5B51321864; Fri, 27 Apr 2018 14:06:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B51321864 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.14 12/80] l2tp: check sockaddr length in pppol2tp_connect() Date: Fri, 27 Apr 2018 15:58:05 +0200 Message-Id: <20180427135733.561313445@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135732.928644313@linuxfoundation.org> References: <20180427135732.928644313@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.14-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 @@ -591,6 +591,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;