From patchwork Tue Feb 4 13:23:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13959192 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A492721A953 for ; Tue, 4 Feb 2025 13:24:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738675459; cv=none; b=WTq1B0XyB3zOtgBDgY658/moFBybRuWcirdqlpIF63NZ7zuuaVvS1+peUdnBs33wCTSrW6n394K+HRaF8ClAOXnb8r8X8X/Q3JNGV3wV5WJXJoQLaCYxLAfiiRL+K2WwN9DaC4ZIYN/oF5ElzOE7oXdKrZFQeuEyhoQns5Z/3CM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738675459; c=relaxed/simple; bh=vDaWHHNgn1bWEPl0PRv7zsig9RoElCDHRaoQj0cC/Q4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XMLY100w7dtTtHC3LDgwSR+sgULtRaQ8efIYshq8r99JdhVKxunfNpqzAuoyQERiXX5oG4Kt9Htfek4VOX4QOACyf0QAewX0O8bZ2rkskT0fqiintaCcnD2oQSOOB0fjeVj0P77WPS/7cnMtHqUqG2Yl5/Vy4oxtfFZvwctZUJc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=T1hlE/fg; arc=none smtp.client-ip=209.85.219.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="T1hlE/fg" Received: by mail-qv1-f74.google.com with SMTP id 6a1803df08f44-6e429a54eb4so10866616d6.1 for ; Tue, 04 Feb 2025 05:24:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738675456; x=1739280256; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=e3VvVkXoQOBpW0WsqT7kuoRLQqr+20O8tQ41NFxntCc=; b=T1hlE/fgwL4Uo/Wv2DxRLKjdT2U75awIkAbZ62zBAz7JSI0UMHOmEUOIIIUY64dN6i mBrVQOjaMtatK0ehWTbHA1oQRldllO2n+JxTMIK59QjVwlGf+b/PtFZ7mVKSIF+62g+E RIUqq1s8sGQ0ev5GIey3N9LzQy+WzQ9Z/nduRRP1iptXjGpSXkOSX/VtXR6p7WPmhPTe lBd5Q5b9juG0xVPXk/bskkul3MZiFUqSAlremm3bjFkY7L0M9xh8cFALhi4b/57xAkBP bG9vPrELx0Sx9up65y30Gaj/NbJeoGW939v51zch0/6Qm7F/APeyz5wNm4FBmt8NBQGd g4tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738675456; x=1739280256; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e3VvVkXoQOBpW0WsqT7kuoRLQqr+20O8tQ41NFxntCc=; b=lY+sc9GQENih32RXarDZ2V9cUSW41jtj86bC3x+yymrU2zmtIR77BQWFj3B8q072om M+ebQ0w0/zFCFORhFskf0mNlegx95h54XwzFwvj70NpuindcqmYylhsbluwa80DNFL3e c458kf8scWR+3hza7yrGqCiEk/F7AhCn/j/boTjcFvIrfw4W23NCr2rmr4NCJtRBGZS6 ltrwujft4spiyGlXtYs7t3+OVBd82v+f4KmtC/8ZckgEtH0nFFxXFvIVXPx1d2ryky5V qYJBnbNXEVv/2W2RAYUtnR3lyE5nOMp2wY3FcIFYcOyb0hD3wjp9mu+JyBu72r2os2wB oB2w== X-Gm-Message-State: AOJu0YyTsRoV26ty6uZIdxg87/7ZGRdv1O9rlS21gPPcQ866xZYYvlcD GAth8dKu+ZpM2/fsEzBV78hpghQP5naZLRLeDx4tmPX455Apv6fXZkbf2MWcHlnr+Ta0TW+m/TY Exi2989rUng== X-Google-Smtp-Source: AGHT+IHCzQVobjIXcaP7X1ut3axs79RKGXSED0PCQzkmaz2qhfAJjQZahb6jw8FSti9ZcRm0/G1eVxfBRfoUfA== X-Received: from qvbmy3.prod.google.com ([2002:a05:6214:2e43:b0:6d8:eaf4:9e3c]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:240c:b0:6d8:6a74:ae68 with SMTP id 6a1803df08f44-6e243ca87c6mr310960186d6.29.1738675456632; Tue, 04 Feb 2025 05:24:16 -0800 (PST) Date: Tue, 4 Feb 2025 13:23:50 +0000 In-Reply-To: <20250204132357.102354-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250204132357.102354-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.362.g079036d154-goog Message-ID: <20250204132357.102354-10-edumazet@google.com> Subject: [PATCH v3 net 09/16] ipv4: icmp: convert to dev_net_rcu() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, Kuniyuki Iwashima , Simon Horman , eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org __icmp_send() must ensure rcu_read_lock() is held, as spotted by Jakub. Other ICMP uses of dev_net() seem safe, change them to dev_net_rcu() to get LOCKDEP support. Fixes: dde1bc0e6f86 ("[NETNS]: Add namespace for ICMP replying code.") Closes: https://lore.kernel.org/netdev/20250203153633.46ce0337@kernel.org/ Reported-by: Jakub Kicinski Signed-off-by: Eric Dumazet --- net/ipv4/icmp.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 094084b61bff8a17c4e85c99019b84e9cba21599..5482edb5aade2bc25a39d75ab16feba476bb08ac 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -399,10 +399,10 @@ static void icmp_push_reply(struct sock *sk, static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) { - struct ipcm_cookie ipc; struct rtable *rt = skb_rtable(skb); - struct net *net = dev_net(rt->dst.dev); + struct net *net = dev_net_rcu(rt->dst.dev); bool apply_ratelimit = false; + struct ipcm_cookie ipc; struct flowi4 fl4; struct sock *sk; struct inet_sock *inet; @@ -608,12 +608,14 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, struct sock *sk; if (!rt) - goto out; + return; + + rcu_read_lock(); if (rt->dst.dev) - net = dev_net(rt->dst.dev); + net = dev_net_rcu(rt->dst.dev); else if (skb_in->dev) - net = dev_net(skb_in->dev); + net = dev_net_rcu(skb_in->dev); else goto out; @@ -785,7 +787,8 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, icmp_xmit_unlock(sk); out_bh_enable: local_bh_enable(); -out:; +out: + rcu_read_unlock(); } EXPORT_SYMBOL(__icmp_send); @@ -834,7 +837,7 @@ static void icmp_socket_deliver(struct sk_buff *skb, u32 info) * avoid additional coding at protocol handlers. */ if (!pskb_may_pull(skb, iph->ihl * 4 + 8)) { - __ICMP_INC_STATS(dev_net(skb->dev), ICMP_MIB_INERRORS); + __ICMP_INC_STATS(dev_net_rcu(skb->dev), ICMP_MIB_INERRORS); return; } @@ -868,7 +871,7 @@ static enum skb_drop_reason icmp_unreach(struct sk_buff *skb) struct net *net; u32 info = 0; - net = dev_net(skb_dst(skb)->dev); + net = dev_net_rcu(skb_dst(skb)->dev); /* * Incomplete header ? @@ -979,7 +982,7 @@ static enum skb_drop_reason icmp_unreach(struct sk_buff *skb) static enum skb_drop_reason icmp_redirect(struct sk_buff *skb) { if (skb->len < sizeof(struct iphdr)) { - __ICMP_INC_STATS(dev_net(skb->dev), ICMP_MIB_INERRORS); + __ICMP_INC_STATS(dev_net_rcu(skb->dev), ICMP_MIB_INERRORS); return SKB_DROP_REASON_PKT_TOO_SMALL; } @@ -1011,7 +1014,7 @@ static enum skb_drop_reason icmp_echo(struct sk_buff *skb) struct icmp_bxm icmp_param; struct net *net; - net = dev_net(skb_dst(skb)->dev); + net = dev_net_rcu(skb_dst(skb)->dev); /* should there be an ICMP stat for ignored echos? */ if (READ_ONCE(net->ipv4.sysctl_icmp_echo_ignore_all)) return SKB_NOT_DROPPED_YET; @@ -1040,9 +1043,9 @@ static enum skb_drop_reason icmp_echo(struct sk_buff *skb) bool icmp_build_probe(struct sk_buff *skb, struct icmphdr *icmphdr) { + struct net *net = dev_net_rcu(skb->dev); struct icmp_ext_hdr *ext_hdr, _ext_hdr; struct icmp_ext_echo_iio *iio, _iio; - struct net *net = dev_net(skb->dev); struct inet6_dev *in6_dev; struct in_device *in_dev; struct net_device *dev; @@ -1181,7 +1184,7 @@ static enum skb_drop_reason icmp_timestamp(struct sk_buff *skb) return SKB_NOT_DROPPED_YET; out_err: - __ICMP_INC_STATS(dev_net(skb_dst(skb)->dev), ICMP_MIB_INERRORS); + __ICMP_INC_STATS(dev_net_rcu(skb_dst(skb)->dev), ICMP_MIB_INERRORS); return SKB_DROP_REASON_PKT_TOO_SMALL; } @@ -1198,7 +1201,7 @@ int icmp_rcv(struct sk_buff *skb) { enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED; struct rtable *rt = skb_rtable(skb); - struct net *net = dev_net(rt->dst.dev); + struct net *net = dev_net_rcu(rt->dst.dev); struct icmphdr *icmph; if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) { @@ -1371,9 +1374,9 @@ int icmp_err(struct sk_buff *skb, u32 info) struct iphdr *iph = (struct iphdr *)skb->data; int offset = iph->ihl<<2; struct icmphdr *icmph = (struct icmphdr *)(skb->data + offset); + struct net *net = dev_net_rcu(skb->dev); int type = icmp_hdr(skb)->type; int code = icmp_hdr(skb)->code; - struct net *net = dev_net(skb->dev); /* * Use ping_err to handle all icmp errors except those