From patchwork Thu May 14 10:15:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 219267 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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 05DA1C433E1 for ; Thu, 14 May 2020 10:15:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB9E92065D for ; Thu, 14 May 2020 10:15:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iwzhMx4S" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726087AbgENKPq (ORCPT ); Thu, 14 May 2020 06:15:46 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:20454 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725974AbgENKPp (ORCPT ); Thu, 14 May 2020 06:15:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589451344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KIaE7ARBsCzF+D+Y+4GJpIzb5KDD/6yGLZ7ng/uwes=; b=iwzhMx4SYNWYx2JEVaN3PpbKNWq4EhhhYOiqUEjJHbt/yOXcbGpCornYp8oAHZZgroQwLf PFkyj1teycfNQO5/6SGaDL8mc2Eb/En1M1Wsfn6lfUP+62sUvzJCLqZKmqTfIYFrYYIgTv ggMWm3iYOGS3MpgWM4q+Gd88JahC498= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-o7Ax251cNlq2RA2no_dT1Q-1; Thu, 14 May 2020 06:15:42 -0400 X-MC-Unique: o7Ax251cNlq2RA2no_dT1Q-1 Received: by mail-wm1-f71.google.com with SMTP id k17so3924063wmi.4 for ; Thu, 14 May 2020 03:15:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding; bh=+KIaE7ARBsCzF+D+Y+4GJpIzb5KDD/6yGLZ7ng/uwes=; b=Nt9ma5XtFBzrFpFz3Log63cUE6ru15faOpbSu8AV8s6YpazR+7iPqPBcrRxcfWBAhh cl8FT9Yi+DbAVBYH8j3QPgB7t4oCjy/vHwluY2UgKvXeQ9Yxnhj/Ooxy1/TGLwS+NBEv 4Pq3DJzQ6/SqPqywCz2a3EIkUh8Jl23IUDlnuTZlV8YQRbz7JGe0TlPniP51KAhHcPVX xroaTyhDBTSRynYxFv8tCvRVw/j0nLxSCoQfun1ZLWwyQX/vgMMIPMq+Yao/EI4h5+5R FCoiFludrOmtVjjXRDobG7wg1BgJxVZfaQafbCg29gtNWPsDM1wbeUAgvUN7vbPr31TK lUBw== X-Gm-Message-State: AOAM530PS9CTsXfvrBg/GmIl72QUZhtvVvJVcsM5mhpltrcRjR4KEq5X 47BiNxJTkgTzy5NPM3yK6NeYLcUtwsmiqUMccjxWsjAef7oCLO1OnHFaSeEarwQDIvfQSWmn89A tLmMuJy+jfsD6BiIW X-Received: by 2002:a5d:4102:: with SMTP id l2mr4486585wrp.51.1589451341496; Thu, 14 May 2020 03:15:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8DRYFKPhMC7pOj2fNsvPjhYO/tsIxJqxtwRCnmmrdKtGKfo4uvUGZJyi/ARo9q267NGwFpg== X-Received: by 2002:a5d:4102:: with SMTP id l2mr4486569wrp.51.1589451341318; Thu, 14 May 2020 03:15:41 -0700 (PDT) Received: from pc-3.home (2a01cb0585138800b113760e11343d15.ipv6.abo.wanadoo.fr. [2a01:cb05:8513:8800:b113:760e:1134:3d15]) by smtp.gmail.com with ESMTPSA id c17sm3301020wrn.59.2020.05.14.03.15.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2020 03:15:40 -0700 (PDT) Date: Thu, 14 May 2020 12:15:39 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski Cc: netdev@vger.kernel.org, David =?utf-8?q?Bala=C5=BEic?= Subject: [PATCH net] pppoe: only process PADT targeted at local interfaces Message-ID: <87314848e98d74e88b3c3b2504566a7691f5a8e9.1589451271.git.gnault@redhat.com> MIME-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 d760a36db28c..beedaad08255 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -490,6 +490,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;