From patchwork Wed Feb 26 18:34:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13992975 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) (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 052BB18DB2E for ; Wed, 26 Feb 2025 18:34:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594886; cv=none; b=D0HtpMxuqvzCdnQDvFWgxlGHcaUgoeahaxEQYBFttsg0cNLdGmc88smJdVQh4FI3YlbEyEC7IoilylzSOksro1dtvN5tyd6lVZCS/7qVau+Mwko6Pg2w0bJgQ9vx/UOJJjZcYoyUS5+kNT9eo5VRMrQDJg3mzISrQDQf1ldrs8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594886; c=relaxed/simple; bh=XAXVOAaXzAMvjnz5/ocTIWEawKKQ7e3an2hytysT4G8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FMD+BJ2GyXbShLFDDVuVBa8lLfCheEN4QAIPtccD0mqP+irJqyD1L8RR4DsX+NgNSsTAk0CkQataG8fNRaeQ3Q6lN8BLW7ieNgRmVnYx0+nDEn+AsUZgjQjwMwbZna0+YWjCv8l2R154Uf3kmdB4cEn71UYIAGf5aQkZIx6cyEI= 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=FhNKbqyf; arc=none smtp.client-ip=209.85.222.202 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="FhNKbqyf" Received: by mail-qk1-f202.google.com with SMTP id af79cd13be357-7c09a206b3eso14651385a.2 for ; Wed, 26 Feb 2025 10:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740594884; x=1741199684; 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=QDCHglNOXVQ4LCS+WnT8RTJFt8fFnMWZqyMLSSz4QAE=; b=FhNKbqyf1+YDolfjOSkADsSolVJowGvnbaa1SGK+f4cyWljuqE3djdMbw8mcvPB/w1 AZ01kFl0uG+FkFNdHEUwt3xcSCLB7P+JU/HON8fauDXhhKLJDCry8kpGh2WqIASlBMng suN44Vm8ewhbTO8W/YxGNYxTcE59wOxJGpexPXHnDpEMvJPPR0GFrUqG6BrftLD3FhvL rW988TlTbH2IAt4k3YFL3IgzxmRaHsNmiBfGaet9UFVbFebfBz6jGoInjj0ORw6YWqPY 5gUWfezhHLQltz4dcJc0Yw+unBkgNUPfB4pTDUYf4IatUiRVMrwTEMdkbLNuMBEjbpZm VXXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740594884; x=1741199684; 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=QDCHglNOXVQ4LCS+WnT8RTJFt8fFnMWZqyMLSSz4QAE=; b=WlehBor/w3haI8CQXWdBk9eCIjkcrVVSWo6Y94CBYJHQqAeIEgO7j4T4JUCaFnlg9w /xCys92Kx6AfhrVPVcD3+rnQxgNPBa9oq6wlMyvxich8J3teR3UJC39eT2TIc6WOgyAx 3GTQ8j1LyVEOq5paIeF1LyOQPy4VNv+z4aW7u1op1o/Jr3T8XY1sGAL243hJOwPGr6+p 8FpGODENzPEFlGny3YFWf37AYOqQ1nAMSAf+AOIIYfFXI5uEhkGlM+AuEXxOWjv98i8Y TeBmpnrIXkb2aLg7uayNomBO8NoiuiNcXj7R7w0E99e8qD2m+lEBxSQTMW/jR3dAA6xQ Zy/w== X-Forwarded-Encrypted: i=1; AJvYcCVcLB194QqWBORACGi7OsSd90bgpm+grRyxJt1tfnKhXMkL999EhU5mGvVKT31zvoAZY4byRZM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+/kdLq3L+PQC8KjEJOAMdVmEPGQIp/nylTJA1YzBM49oxVv2b Ae4BqtvDVHQCKk5SazU3Rnexj1cGmB+2Q8gdU4xOYRAu7ZPuosyNdfooq3bNac5eIbIshim8hhs 0nXiipfaSUg== X-Google-Smtp-Source: AGHT+IEtf3KDJ7PlVhC3BZeM5InR9XnPuPsAz96iltPm6VznnSrti/7SfTfNyZ0BZYPCfY96wxUdOim4qPxZqw== X-Received: from qknpw8.prod.google.com ([2002:a05:620a:63c8:b0:7c0:ac00:8021]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:45a1:b0:7c0:a431:6c5e with SMTP id af79cd13be357-7c247f433c1mr590859685a.31.1740594883921; Wed, 26 Feb 2025 10:34:43 -0800 (PST) Date: Wed, 26 Feb 2025 18:34:36 +0000 In-Reply-To: <20250226183437.1457318-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250226183437.1457318-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog Message-ID: <20250226183437.1457318-2-edumazet@google.com> Subject: [PATCH net-next 1/2] ipv4: icmp: do not process ICMP_EXT_ECHOREPLY for broadcast/multicast addresses From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, David Ahern , Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org There is no point processing ICMP_EXT_ECHOREPLY for routes which would drop ICMP_ECHOREPLY (RFC 1122 3.2.2.6, 3.2.2.8) This seems an oversight of the initial implementation. Signed-off-by: Eric Dumazet --- net/ipv4/icmp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 799775ba97d4f1bad1f070fb2a2596650df177af..058d4c1e300d0c0be7a04fd67e8e39924dfcd2cc 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -1248,22 +1248,6 @@ int icmp_rcv(struct sk_buff *skb) goto reason_check; } - if (icmph->type == ICMP_EXT_ECHOREPLY) { - reason = ping_rcv(skb); - goto reason_check; - } - - /* - * 18 is the highest 'known' ICMP type. Anything else is a mystery - * - * RFC 1122: 3.2.2 Unknown ICMP messages types MUST be silently - * discarded. - */ - if (icmph->type > NR_ICMP_TYPES) { - reason = SKB_DROP_REASON_UNHANDLED_PROTO; - goto error; - } - /* * Parse the ICMP message */ @@ -1290,6 +1274,22 @@ int icmp_rcv(struct sk_buff *skb) } } + if (icmph->type == ICMP_EXT_ECHOREPLY) { + reason = ping_rcv(skb); + goto reason_check; + } + + /* + * 18 is the highest 'known' ICMP type. Anything else is a mystery + * + * RFC 1122: 3.2.2 Unknown ICMP messages types MUST be silently + * discarded. + */ + if (icmph->type > NR_ICMP_TYPES) { + reason = SKB_DROP_REASON_UNHANDLED_PROTO; + goto error; + } + reason = icmp_pointers[icmph->type].handler(skb); reason_check: if (!reason) { From patchwork Wed Feb 26 18:34:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13992976 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 E959C233D64 for ; Wed, 26 Feb 2025 18:34:46 +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=1740594888; cv=none; b=KO70/MOMN2I7ej8f9I8a3+llAlgRyEEmU0qy85ab7g19fnx3jUdSIOxCVYbyvLE024o/Z6bvgm1ti299ZjQaixEtyyeTZYhtIMUNVbW8avskdGQksd5F8L/0j8+dWbdhm38uVOBVDU/twIpwy/KKtHLoud58ZnpXnnpDMV4wmCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594888; c=relaxed/simple; bh=3sZfZtOKL3PpVdC39mlrXhBge0rl1bXXre5FIIr8k4I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BJU4ZK0du/6sJWmJzqJY31wB8UWcoLxC8agX0/r8pr/CTz9FQPmFjI/hyiq9iNiBMPFWv7lxpIZnQUhpOdx5UUC0nz/V3HJPiVnV0+U9+cfhO2ppf5Yo+zTXrBY/rbZDMq6+lNzyD/KsCrYnfft9oRj7IbcgKVfasCRbC4dWk8s= 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=ntYMS4pb; 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="ntYMS4pb" Received: by mail-qv1-f74.google.com with SMTP id 6a1803df08f44-6e66da368dcso3243766d6.2 for ; Wed, 26 Feb 2025 10:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740594886; x=1741199686; 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=I4hiN/VZM10UazaG5cSjXr3c/vEDQf1vDgCFbogESV0=; b=ntYMS4pb8EWjl74dRC5pJvaYUxIQUB/KNFVhTe+NdHeR/R5sXvLagdd9iVx5yXEMHd t34FSt40BhTxCVyd48MtSn0eC4wjLM2WubawZg/iC7jFEMT+aDsUo+ua0UOEKuwBji5z GCoD59CFES9W44xK6OUqPI0lpsGrmwk0vWjaNeMSS/JeDRdKZa+KkelJoTxTLaVAgKFm Zp0pie4nPYDQfwyM+p9re8QlD4+sYk44NCUWv3nBstqmZWeVpeVQaqNsdbLeoeiGnPTX sEF7s8tRRtrN020/mYPR4BwWjHMtGBbndOy5Rgkr5F41sZmeA4FFpIwql5e5xM2OLa+4 6mTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740594886; x=1741199686; 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=I4hiN/VZM10UazaG5cSjXr3c/vEDQf1vDgCFbogESV0=; b=deSjGPjBo1FqVdLO5n7xtDc0NxVVf5CVa9ZLhnCh8WBmkddnQbUQIHtR3fFZh4rDmC gSs5rpfx2K4FrEMT+1VcbqJW5zPTd4XGcXhL+ZgW7uQyrmROw34FuklqA09JWEJtcwST Bx2uxlom90mhz/D77X9VSNa6IJELP5jYG1T5HGW+LiVVUbgGqoE7NDGPRLUUnkvTqJ+j EdqhIl1OHNggyDnMf9kBzguHfn1b4Yh0d2PbrF6sqhoEYag3H2kmjU34MIHGMPYRe2we pcv7FfC7OBRQUxrhEgUmaZ+fIYN+AwNnkAEUhxgNkry3rJxQLeHzH97F7SlYXEp/HXyL +L8Q== X-Forwarded-Encrypted: i=1; AJvYcCU/X+3BV760bNfa6fTn/1ex9gfFuGGg+dUtuOYC2etjY6qQ0d4q9L90f2QHg/n+QQb7jG1Ox6o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6xA4FBC4Rg0EreHLcbdLTD9EChwqwcpUKyCcbPTQ7cHuJd9RP zQAYQlXpZTJ3CMVMNvKYrUzEvfzuhOML+jyWuXN1SQ/c0YHd43CEhWPig4zVhhVSmS0m5AhqoAO aoVBukrSTEQ== X-Google-Smtp-Source: AGHT+IG16cDtr7NH9TWdwx1dia+HRZzDsTVJZZbv7Fjlq5tfQQm4iGULi25+4YzjCIdvmFvEmC01UPEl7za0IA== X-Received: from qvzc2.prod.google.com ([2002:a05:6214:702:b0:6e6:5bdc:ac7d]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:2b08:b0:6e4:6ef7:b5fc with SMTP id 6a1803df08f44-6e6ae7f7ef2mr284964336d6.14.1740594885888; Wed, 26 Feb 2025 10:34:45 -0800 (PST) Date: Wed, 26 Feb 2025 18:34:37 +0000 In-Reply-To: <20250226183437.1457318-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250226183437.1457318-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog Message-ID: <20250226183437.1457318-3-edumazet@google.com> Subject: [PATCH net-next 2/2] inet: ping: avoid skb_clone() dance in ping_rcv() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, David Ahern , Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org ping_rcv() callers currently call skb_free() or consume_skb(), forcing ping_rcv() to clone the skb. After this patch ping_rcv() is now 'consuming' the original skb, either moving to a socket receive queue, or dropping it. Signed-off-by: Eric Dumazet --- net/ipv4/icmp.c | 5 +++-- net/ipv4/ping.c | 20 +++++--------------- net/ipv6/icmp.c | 7 ++----- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 058d4c1e300d0c0be7a04fd67e8e39924dfcd2cc..717cb7d3607a1c77a3f54b56d2bb98b1064dd878 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -1274,9 +1274,10 @@ int icmp_rcv(struct sk_buff *skb) } } - if (icmph->type == ICMP_EXT_ECHOREPLY) { + if (icmph->type == ICMP_EXT_ECHOREPLY || + icmph->type == ICMP_ECHOREPLY) { reason = ping_rcv(skb); - goto reason_check; + return reason ? NET_RX_DROP : NET_RX_SUCCESS; } /* diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 85d09f2ecadcb690f01985771afa37ce2cd0befc..c14baa6589c748026b49416688cbea399e6d461a 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -966,10 +966,9 @@ EXPORT_SYMBOL_GPL(ping_queue_rcv_skb); enum skb_drop_reason ping_rcv(struct sk_buff *skb) { - enum skb_drop_reason reason = SKB_DROP_REASON_NO_SOCKET; - struct sock *sk; struct net *net = dev_net(skb->dev); struct icmphdr *icmph = icmp_hdr(skb); + struct sock *sk; /* We assume the packet has already been checked by icmp_rcv */ @@ -980,20 +979,11 @@ enum skb_drop_reason ping_rcv(struct sk_buff *skb) skb_push(skb, skb->data - (u8 *)icmph); sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id)); - if (sk) { - struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); - - pr_debug("rcv on socket %p\n", sk); - if (skb2) - reason = __ping_queue_rcv_skb(sk, skb2); - else - reason = SKB_DROP_REASON_NOMEM; - } - - if (reason) - pr_debug("no socket, dropping\n"); + if (sk) + return __ping_queue_rcv_skb(sk, skb); - return reason; + kfree_skb_reason(skb, SKB_DROP_REASON_NO_SOCKET); + return SKB_DROP_REASON_NO_SOCKET; } EXPORT_SYMBOL_GPL(ping_rcv); diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 4d14ab7f7e99f152cd5f5adaa023f0280957f275..3fd19a84b358d169bbdc351c43ede830c60afcf3 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -957,12 +957,9 @@ static int icmpv6_rcv(struct sk_buff *skb) break; case ICMPV6_ECHO_REPLY: - reason = ping_rcv(skb); - break; - case ICMPV6_EXT_ECHO_REPLY: - reason = ping_rcv(skb); - break; + ping_rcv(skb); + return 0; case ICMPV6_PKT_TOOBIG: /* BUGGG_FUTURE: if packet contains rthdr, we cannot update