diff options
| author | Anirudh Gupta | 2019-05-21 17:29:47 +0200 |
|---|---|---|
| committer | Steffen Klassert | 2019-05-28 09:16:30 +0200 |
| commit | b38ff4075a80b4da5cb2202d7965332ca0efb213 (patch) | |
| tree | ce1c22930ec6d5226927d0befda04237ac5c94ca /net/xfrm | |
| parent | net: stmmac: dma channel control register need to be init first (diff) | |
| download | kernel-qcow2-linux-b38ff4075a80b4da5cb2202d7965332ca0efb213.tar.gz kernel-qcow2-linux-b38ff4075a80b4da5cb2202d7965332ca0efb213.tar.xz kernel-qcow2-linux-b38ff4075a80b4da5cb2202d7965332ca0efb213.zip | |
xfrm: Fix xfrm sel prefix length validation
Family of src/dst can be different from family of selector src/dst.
Use xfrm selector family to validate address prefix length,
while verifying new sa from userspace.
Validated patch with this command:
ip xfrm state add src 1.1.6.1 dst 1.1.6.2 proto esp spi 4260196 \
reqid 20004 mode tunnel aead "rfc4106(gcm(aes))" \
0x1111016400000000000000000000000044440001 128 \
sel src 1011:1:4::2/128 sel dst 1021:1:4::2/128 dev Port5
Fixes: 07bf7908950a ("xfrm: Validate address prefix lengths in the xfrm selector.")
Signed-off-by: Anirudh Gupta <anirudh.gupta@sophos.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index eb8d14389601..74a3d1e0ff63 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -151,6 +151,22 @@ 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_INET: if (p->sel.prefixlen_d > 32 || p->sel.prefixlen_s > 32) goto out; |