public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Tianhao Zhao <tizhao@redhat.com>,
	Paolo Abeni <pabeni@redhat.com>, David Ahern <dsahern@gmail.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 4.14 04/34] ipv4/route: fail early when inet dev is missing
Date: Mon, 18 Mar 2019 10:25:28 +0100	[thread overview]
Message-ID: <20190318084145.238752150@linuxfoundation.org> (raw)
In-Reply-To: <20190318084144.657740413@linuxfoundation.org>

4.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Paolo Abeni <pabeni@redhat.com>

[ Upstream commit 22c74764aa2943ecdf9f07c900d8a9c8ba6c9265 ]

If a non local multicast packet reaches ip_route_input_rcu() while
the ingress device IPv4 private data (in_dev) is NULL, we end up
doing a NULL pointer dereference in IN_DEV_MFORWARD().

Since the later call to ip_route_input_mc() is going to fail if
!in_dev, we can fail early in such scenario and avoid the dangerous
code path.

v1 -> v2:
 - clarified the commit message, no code changes

Reported-by: Tianhao Zhao <tizhao@redhat.com>
Fixes: e58e41596811 ("net: Enable support for VRF with ipv4 multicast")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/route.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2123,12 +2123,13 @@ int ip_route_input_rcu(struct sk_buff *s
 		int our = 0;
 		int err = -EINVAL;
 
-		if (in_dev)
-			our = ip_check_mc_rcu(in_dev, daddr, saddr,
-					      ip_hdr(skb)->protocol);
+		if (!in_dev)
+			return err;
+		our = ip_check_mc_rcu(in_dev, daddr, saddr,
+				      ip_hdr(skb)->protocol);
 
 		/* check l3 master if no match yet */
-		if ((!in_dev || !our) && netif_is_l3_slave(dev)) {
+		if (!our && netif_is_l3_slave(dev)) {
 			struct in_device *l3_in_dev;
 
 			l3_in_dev = __in_dev_get_rcu(skb->dev);



  parent reply	other threads:[~2019-03-18  9:35 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-18  9:25 [PATCH 4.14 00/34] 4.14.107-stable review Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 01/34] ACPICA: Reference Counts: increase max to 0x4000 for large servers Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 02/34] perf tools: Fix compile error with libunwind x86 Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 03/34] gro_cells: make sure device is up in gro_cells_receive() Greg Kroah-Hartman
2019-03-18  9:25 ` Greg Kroah-Hartman [this message]
2019-03-18  9:25 ` [PATCH 4.14 05/34] l2tp: fix infoleak in l2tp_ip6_recvmsg() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 06/34] net: hsr: fix memory leak in hsr_dev_finalize() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 07/34] net/hsr: fix possible crash in add_timer() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 08/34] net: sit: fix UBSAN Undefined behaviour in check_6rd Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 09/34] net/x25: fix use-after-free in x25_device_event() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 10/34] net/x25: reset state in x25_connect() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 11/34] pptp: dst_release sk_dst_cache in pptp_sock_destruct Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 12/34] ravb: Decrease TxFIFO depth of Q3 and Q2 to one Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 13/34] route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to fix a race Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 14/34] rxrpc: Fix client call queueing, waiting for channel Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 15/34] tcp: Dont access TCP_SKB_CB before initializing it Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 16/34] tcp: handle inet_csk_reqsk_queue_add() failures Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 17/34] vxlan: Fix GRO cells race condition between receive and link delete Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 18/34] vxlan: test dev->flags & IFF_UP before calling gro_cells_receive() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 19/34] net/mlx4_core: Fix reset flow when in command polling mode Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 20/34] net/mlx4_core: Fix locking in SRIOV mode when switching between events and polling Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 21/34] net/mlx4_core: Fix qp mtt size calculation Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 22/34] net/x25: fix a race in x25_bind() Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 23/34] mdio_bus: Fix use-after-free on device_register fails Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 24/34] net: Set rtm_table to RT_TABLE_COMPAT for ipv6 for tables > 255 Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 25/34] bonding: fix PACKET_ORIGDEV regression Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 26/34] missing barriers in some of unix_sock ->addr and ->path accesses Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 27/34] ipvlan: disallow userns cap_net_admin to change global mode/flags Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 28/34] perf/x86: Fixup typo in stub functions Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 29/34] ALSA: bebob: use more identical mod_alias for Saffire Pro 10 I/O against Liquid Saffire 56 Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 30/34] ALSA: firewire-motu: fix construction of PCM frame for capture direction Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 31/34] perf/x86/intel: Fix memory corruption Greg Kroah-Hartman
2019-03-18 18:20   ` DSouza, Nelson
2019-03-18 20:29   ` DSouza, Nelson
2019-03-19 12:20     ` Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 32/34] perf/x86/intel: Make dev_attr_allow_tsx_force_abort static Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 33/34] Its wrong to add len to sector_nr in raid10 reshape twice Greg Kroah-Hartman
2019-03-18  9:25 ` [PATCH 4.14 34/34] vhost/vsock: fix vhost vsock cid hashing inconsistent Greg Kroah-Hartman
2019-03-18 13:22 ` [PATCH 4.14 00/34] 4.14.107-stable review kernelci.org bot
2019-03-18 16:27 ` Naresh Kamboju
2019-03-19  2:25 ` Guenter Roeck
2019-03-19 10:33 ` Jon Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190318084145.238752150@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=davem@davemloft.net \
    --cc=dsahern@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=tizhao@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox