Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 089282fb028198169a0f62f8f833ab6d06bdbb3c

Authored by David S. Miller
1 parent 19449bfc10
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

netfilter: xt_socket: Make tproto signed in socket_mt6_v1(). 

Otherwise error indications from ipv6_find_hdr() won't be noticed.

This required making the protocol argument to extract_icmp6_fields()
signed too.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

net/netfilter/xt_socket.c
Diff comments   View file @ 089282f
... ... @@ -195,7 +195,7 @@
195 195 static int
196 196 extract_icmp6_fields(const struct sk_buff *skb,
197 197 unsigned int outside_hdrlen,
198   - u8 *protocol,
  198 + int *protocol,
199 199 struct in6_addr **raddr,
200 200 struct in6_addr **laddr,
201 201 __be16 *rport,
... ... @@ -252,8 +252,7 @@
252 252 struct sock *sk;
253 253 struct in6_addr *daddr, *saddr;
254 254 __be16 dport, sport;
255   - int thoff;
256   - u8 tproto;
  255 + int thoff, tproto;
257 256 const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;
258 257  
259 258 tproto = ipv6_find_hdr(skb, &thoff, -1, NULL);
... ... @@ -305,7 +304,7 @@
305 304 sk = NULL;
306 305 }
307 306  
308   - pr_debug("proto %hhu %pI6:%hu -> %pI6:%hu "
  307 + pr_debug("proto %hhd %pI6:%hu -> %pI6:%hu "
309 308 "(orig %pI6:%hu) sock %p\n",
310 309 tproto, saddr, ntohs(sport),
311 310 daddr, ntohs(dport),