Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "ipv6: fix ndisc_is_useropt() handling for PIO"

Browse source 
This reverts commit 254636f1d3.
This commit is contained in:
Ksawlii 2024-11-24 00:23:55 +01:00
parent 6e343e2374
commit 91e81d11cd
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/ipv6/ndisc.c
View file

@ -226,7 +226,6 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
return NULL;
memset(ndopts, 0, sizeof(*ndopts));
while (opt_len) {
bool unknown = false;
int l;
if (opt_len < sizeof(struct nd_opt_hdr))
return NULL;
@ -262,13 +261,11 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
break;
#endif
default:
unknown = true;
}
if (ndisc_is_useropt(dev, nd_opt)) {
ndopts->nd_useropts_end = nd_opt;
if (!ndopts->nd_useropts)
ndopts->nd_useropts = nd_opt;
} else if (unknown) {
} else {
/*
* Unknown options must be silently ignored,
* to accommodate future extension to the
@ -280,6 +277,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
nd_opt->nd_opt_type,
nd_opt->nd_opt_len);
}
}
next_opt:
opt_len -= l;
nd_opt = ((void *)nd_opt) + l;