@@ -197,6 +197,8 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
static inline int ndisc_is_useropt(const struct net_device *dev,
struct nd_opt_hdr *opt)
{
+ // warning: kernel parsed options like ND_OPT_PREFIX_INFO
+ // also need special casing in ndisc_parse_options()
return opt->nd_opt_type == ND_OPT_PREFIX_INFO ||
opt->nd_opt_type == ND_OPT_RDNSS ||
opt->nd_opt_type == ND_OPT_DNSSL ||
@@ -227,6 +229,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
return NULL;
memset(ndopts, 0, sizeof(*ndopts));
while (opt_len) {
+ bool useropt = false;
int l;
if (opt_len < sizeof(struct nd_opt_hdr))
return NULL;
@@ -250,6 +253,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
}
break;
case ND_OPT_PREFIX_INFO:
+ useropt = true;
ndopts->nd_opts_pi_end = nd_opt;
if (!ndopts->nd_opt_array[nd_opt->nd_opt_type])
ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt;
@@ -263,9 +267,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
#endif
default:
if (ndisc_is_useropt(dev, nd_opt)) {
- ndopts->nd_useropts_end = nd_opt;
- if (!ndopts->nd_useropts)
- ndopts->nd_useropts = nd_opt;
+ useropt = true;
} else {
/*
* Unknown options must be silently ignored,
@@ -279,6 +281,11 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
nd_opt->nd_opt_len);
}
}
+ if (useropt) {
+ ndopts->nd_useropts_end = nd_opt;
+ if (!ndopts->nd_useropts)
+ ndopts->nd_useropts = nd_opt;
+ }
next_opt:
opt_len -= l;
nd_opt = ((void *)nd_opt) + l;
The current logic only works if the PIO is between two other ND user options. This fixes it so that the PIO can also be either before or after other ND user options (for example the first or last option in the RA). side note: there's actually Android tests verifying a portion of the old broken behaviour, so: https://android-review.googlesource.com/c/kernel/tests/+/3196704 fixes those up. Cc: Jen Linkova <furry@google.com> Cc: Lorenzo Colitti <lorenzo@google.com> Cc: Patrick Rohr <prohr@google.com> Cc: David Ahern <dsahern@gmail.com> Cc: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> Cc: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Maciej Żenczykowski <maze@google.com> Fixes: 048c796beb6e ("ipv6: adjust ndisc_is_useropt() to also return true for PIO") --- net/ipv6/ndisc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)