diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-08 19:48:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-08 19:48:57 -0700 |
| commit | af144a983402f7fd324ce556d9f9011a8b3e01fe (patch) | |
| tree | 7a0250b960a36976bc683789d9fe86b9f60a97a5 /net/xfrm/xfrm_user.c | |
| parent | 6413139dfc641aaaa30580b59696a5f7ea274194 (diff) | |
| parent | e858faf556d4e14c750ba1e8852783c6f9520a0e (diff) | |
| download | kernel_replicant_linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.gz kernel_replicant_linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.bz2 kernel_replicant_linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 173477211e40..b88ba45ff1ac 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -152,6 +152,25 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, err = -EINVAL; switch (p->family) { case AF_INET: + break; + + case AF_INET6: +#if IS_ENABLED(CONFIG_IPV6) + break; +#else + err = -EAFNOSUPPORT; + goto out; +#endif + + default: + goto out; + } + + switch (p->sel.family) { + case AF_UNSPEC: + break; + + case AF_INET: if (p->sel.prefixlen_d > 32 || p->sel.prefixlen_s > 32) goto out; |