Received: by 10.192.165.148 with SMTP id m20csp815789imm; Fri, 27 Apr 2018 07:59:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqWbSaXAT4qSMefx0pXN5di5omL5Bvvyqusn5QPRRbr6277lfW1hT1I8gnKVz5P8d1G7pBs X-Received: by 2002:a63:41c1:: with SMTP id o184-v6mr2395206pga.393.1524841194710; Fri, 27 Apr 2018 07:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524841194; cv=none; d=google.com; s=arc-20160816; b=cOoJzMSfnUUDJJgvku6fm/gpDz1ZeLHgRAenMHIe2ZJX4/W0mAzksgK/+HbmfQoPFc dKTwro/336PkxgpdcqUZXrbx/vlUr7KgJX+ar8kNGaYRlg+E/pnr4bjUu9LwBERLbV69 B98a5wjPzjjK9NkQQHq0X7HL6dBE4FFs/Xd4iKg1+Vs7NhH8RgZHZcoiSgcpO8XUleK9 9b8cs1DzEAFKA14jymdsgku572u1c1eLAOcr7N1LTYREByusgKl3MJbs0dAKB/q38jKC YyWAzqEz8zaOoSNJ0yLuf+j5fkoS6DGLBp4laZKawJzDvhNoIIvVQZkqPy+Trty8UTAP 6MdQ== 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=UPhhgpzCrlL21s4l+vk6esf3/e0vyQoCpKhhB4oj9IM=; b=QRLuf+4lWmgDoVoKpNftrRAPflLFs3bQSHrQkwmvEHT+098vOafCPUsxSWfNX8fmfY tlpvw3uRS6yWFnf59iHX5ruSQ8UDCfmzm2ziJ156vIZ6WoNRFSsanyq31PzB9pb9dhfp BeLZEpzWWPDLPzJTImJ4o3jExrzgwlfSExJG/cv8kbdOt/T5CENt57648xF1fl3VRvhM qHYZb45XgVIJc10S7Ass9j26lve9Y+dzr6sos5gSCmfWh7nw3LfyKHQIYBRnStK+iTNn ZsiZAKMf2TRzPGjVwzLkHlBzbKNK0451Y9Z5kFoBL3Z/NK9A7lm3CE4kHjEKR6a/tbu/ jK4Q== 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.59.40; Fri, 27 Apr 2018 07:59:54 -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 S934115AbeD0O6k (ORCPT + 99 others); Fri, 27 Apr 2018 10:58:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:52102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934026AbeD0OF7 (ORCPT ); Fri, 27 Apr 2018 10:05:59 -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 1EC2B21890; Fri, 27 Apr 2018 14:05:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EC2B21890 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.9 49/74] l2tp: check sockaddr length in pppol2tp_connect() Date: Fri, 27 Apr 2018 15:58:39 +0200 Message-Id: <20180427135711.964602787@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135709.899303463@linuxfoundation.org> References: <20180427135709.899303463@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.9-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 @@ -590,6 +590,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;