From patchwork Tue Jun 9 17:44:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224707 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42234C433DF for ; Tue, 9 Jun 2020 17:47:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 191E120820 for ; Tue, 9 Jun 2020 17:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591724868; bh=ztWBibTLyxtPC1/akqCXHZhfQhHK7+uZLcSbCXNi+kE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LK7JFpDm9n5Rsz7zzry1b5hAbSjL1fpgLnmjNIKPeq1Mg9qCg8tLwUFYWZDFotomL 0MPvpyimpnug3qnT+xk24TSXMYMfsbUVF73bVavfMGSGHzllrDDRZaYm7iNXXcU0HR RO7eF4WDortIu1TkjEuPU+oIawK3LbGe53XTJniE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732153AbgFIRrq (ORCPT ); Tue, 9 Jun 2020 13:47:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:59158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732146AbgFIRrn (ORCPT ); Tue, 9 Jun 2020 13:47:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 97BC820820; Tue, 9 Jun 2020 17:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591724863; bh=ztWBibTLyxtPC1/akqCXHZhfQhHK7+uZLcSbCXNi+kE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZF3kUYPzDqP+mhhBDbYul29ow8c71P5591i4pNe44VhSctAj1XsXjLfyVmr74RZ2e eBxF2opo6lC6LaOHYfx3W1RZSmEpsmLQlGea1y+RX9HoGClnGU9bcFp3ZrFkOhjZ6W glC0oqKdeB5XDz7WV0KZaBR2W9X0HVVikbmC0How= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?David_Bala=C5=BEic?= , Guillaume Nault , "David S. Miller" Subject: [PATCH 4.9 12/42] pppoe: only process PADT targeted at local interfaces Date: Tue, 9 Jun 2020 19:44:18 +0200 Message-Id: <20200609174016.816264928@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174015.379493548@linuxfoundation.org> References: <20200609174015.379493548@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guillaume Nault We don't want to disconnect a session because of a stray PADT arriving while the interface is in promiscuous mode. Furthermore, multicast and broadcast packets make no sense here, so only PACKET_HOST is accepted. Reported-by: David Balažic Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Guillaume Nault Signed-off-by: David S. Miller --- drivers/net/ppp/pppoe.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index fa8f7c40a384..804c52c35f07 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -494,6 +494,9 @@ static int pppoe_disc_rcv(struct sk_buff *skb, struct net_device *dev, if (!skb) goto out; + if (skb->pkt_type != PACKET_HOST) + goto abort; + if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) goto abort;