forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb 
 kernel/net/ipv6/mcast_snoop.c
....@@ -1,18 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /* Copyright (C) 2010: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
23  * Copyright (C) 2015: Linus Lüssing <linus.luessing@c0d3.blue>
3
- *
4
- * This program is free software; you can redistribute it and/or
5
- * modify it under the terms of version 2 of the GNU General Public
6
- * License as published by the Free Software Foundation.
7
- *
8
- * This program is distributed in the hope that it will be useful, but
9
- * WITHOUT ANY WARRANTY; without even the implied warranty of
10
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11
- * General Public License for more details.
12
- *
13
- * You should have received a copy of the GNU General Public License
14
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
15
- *
164  *
175  * Based on the MLD support added to br_multicast.c by YOSHIFUJI Hideaki.
186  */
....@@ -40,6 +28,8 @@
4028 	len = offset + ntohs(ip6h->payload_len);
4129 	if (skb->len < len || len <= offset)
4230 		return -EINVAL;
31
+
32
+	skb_set_transport_header(skb, offset);
4333 
4434 	return 0;
4535 }
....@@ -77,27 +67,27 @@
7767 
7868 	len += sizeof(struct mld2_report);
7969 
80
-	return pskb_may_pull(skb, len) ? 0 : -EINVAL;
70
+	return ipv6_mc_may_pull(skb, len) ? 0 : -EINVAL;
8171 }
8272 
8373 static int ipv6_mc_check_mld_query(struct sk_buff *skb)
8474 {
75
+	unsigned int transport_len = ipv6_transport_len(skb);
8576 	struct mld_msg *mld;
86
-	unsigned int len = skb_transport_offset(skb);
77
+	unsigned int len;
8778 
8879 	/* RFC2710+RFC3810 (MLDv1+MLDv2) require link-local source addresses */
8980 	if (!(ipv6_addr_type(&ipv6_hdr(skb)->saddr) & IPV6_ADDR_LINKLOCAL))
9081 		return -EINVAL;
9182 
92
-	len += sizeof(struct mld_msg);
93
-	if (skb->len < len)
94
-		return -EINVAL;
95
-
9683 	/* MLDv1? */
97
-	if (skb->len != len) {
84
+	if (transport_len != sizeof(struct mld_msg)) {
9885 		/* or MLDv2? */
99
-		len += sizeof(struct mld2_query) - sizeof(struct mld_msg);
100
-		if (skb->len < len || !pskb_may_pull(skb, len))
86
+		if (transport_len < sizeof(struct mld2_query))
87
+			return -EINVAL;
88
+
89
+		len = skb_transport_offset(skb) + sizeof(struct mld2_query);
90
+		if (!ipv6_mc_may_pull(skb, len))
10191 			return -EINVAL;
10292 	}
10393 
....@@ -115,19 +105,24 @@
115105 
116106 static int ipv6_mc_check_mld_msg(struct sk_buff *skb)
117107 {
118
-	struct mld_msg *mld = (struct mld_msg *)skb_transport_header(skb);
108
+	unsigned int len = skb_transport_offset(skb) + sizeof(struct mld_msg);
109
+	struct mld_msg *mld;
110
+
111
+	if (!ipv6_mc_may_pull(skb, len))
112
+		return -ENODATA;
113
+
114
+	mld = (struct mld_msg *)skb_transport_header(skb);
119115 
120116 	switch (mld->mld_type) {
121117 	case ICMPV6_MGM_REDUCTION:
122118 	case ICMPV6_MGM_REPORT:
123
-		/* fall through */
124119 		return 0;
125120 	case ICMPV6_MLD2_REPORT:
126121 		return ipv6_mc_check_mld_reportv2(skb);
127122 	case ICMPV6_MGM_QUERY:
128123 		return ipv6_mc_check_mld_query(skb);
129124 	default:
130
-		return -ENOMSG;
125
+		return -ENODATA;
131126 	}
132127 }
133128 
....@@ -136,70 +131,45 @@
136131 	return skb_checksum_validate(skb, IPPROTO_ICMPV6, ip6_compute_pseudo);
137132 }
138133 
139
-static int __ipv6_mc_check_mld(struct sk_buff *skb,
140
-			       struct sk_buff **skb_trimmed)
141
-
134
+static int ipv6_mc_check_icmpv6(struct sk_buff *skb)
142135 {
143
-	struct sk_buff *skb_chk = NULL;
144
-	unsigned int transport_len;
145
-	unsigned int len = skb_transport_offset(skb) + sizeof(struct mld_msg);
146
-	int ret = -EINVAL;
136
+	unsigned int len = skb_transport_offset(skb) + sizeof(struct icmp6hdr);
137
+	unsigned int transport_len = ipv6_transport_len(skb);
138
+	struct sk_buff *skb_chk;
147139 
148
-	transport_len = ntohs(ipv6_hdr(skb)->payload_len);
149
-	transport_len -= skb_transport_offset(skb) - sizeof(struct ipv6hdr);
140
+	if (!ipv6_mc_may_pull(skb, len))
141
+		return -EINVAL;
150142 
151143 	skb_chk = skb_checksum_trimmed(skb, transport_len,
152144 				       ipv6_mc_validate_checksum);
153145 	if (!skb_chk)
154
-		goto err;
146
+		return -EINVAL;
155147 
156
-	if (!pskb_may_pull(skb_chk, len))
157
-		goto err;
158
-
159
-	ret = ipv6_mc_check_mld_msg(skb_chk);
160
-	if (ret)
161
-		goto err;
162
-
163
-	if (skb_trimmed)
164
-		*skb_trimmed = skb_chk;
165
-	/* free now unneeded clone */
166
-	else if (skb_chk != skb)
148
+	if (skb_chk != skb)
167149 		kfree_skb(skb_chk);
168150 
169
-	ret = 0;
170
-
171
-err:
172
-	if (ret && skb_chk && skb_chk != skb)
173
-		kfree_skb(skb_chk);
174
-
175
-	return ret;
151
+	return 0;
176152 }
177153 
178154 /**
179155  * ipv6_mc_check_mld - checks whether this is a sane MLD packet
180156  * @skb: the skb to validate
181
- * @skb_trimmed: to store an skb pointer trimmed to IPv6 packet tail (optional)
182157  *
183158  * Checks whether an IPv6 packet is a valid MLD packet. If so sets
184159  * skb transport header accordingly and returns zero.
185160  *
186161  * -EINVAL: A broken packet was detected, i.e. it violates some internet
187162  *  standard
188
- * -ENOMSG: IP header validation succeeded but it is not an MLD packet.
163
+ * -ENOMSG: IP header validation succeeded but it is not an ICMPv6 packet
164
+ *  with a hop-by-hop option.
165
+ * -ENODATA: IP+ICMPv6 header with hop-by-hop option validation succeeded
166
+ *  but it is not an MLD packet.
189167  * -ENOMEM: A memory allocation failure happened.
190
- *
191
- * Optionally, an skb pointer might be provided via skb_trimmed (or set it
192
- * to NULL): After parsing an MLD packet successfully it will point to
193
- * an skb which has its tail aligned to the IP packet end. This might
194
- * either be the originally provided skb or a trimmed, cloned version if
195
- * the skb frame had data beyond the IP packet. A cloned skb allows us
196
- * to leave the original skb and its full frame unchanged (which might be
197
- * desirable for layer 2 frame jugglers).
198168  *
199169  * Caller needs to set the skb network header and free any returned skb if it
200170  * differs from the provided skb.
201171  */
202
-int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed)
172
+int ipv6_mc_check_mld(struct sk_buff *skb)
203173 {
204174 	int ret;
205175 
....@@ -211,6 +181,10 @@
211181 	if (ret < 0)
212182 		return ret;
213183 
214
-	return __ipv6_mc_check_mld(skb, skb_trimmed);
184
+	ret = ipv6_mc_check_icmpv6(skb);
185
+	if (ret < 0)
186
+		return ret;
187
+
188
+	return ipv6_mc_check_mld_msg(skb);
215189 }
216190 EXPORT_SYMBOL(ipv6_mc_check_mld);