diff options
author | Cong Wang <xiyou.wangcong@gmail.com> | 2017-11-27 22:15:16 +0300 |
---|---|---|
committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-04 18:28:24 +0300 |
commit | 3f065a1d7cc83800bb68655f6067de71afc5ac62 (patch) | |
tree | f7bb8063cf880ae66d0221cc603689205b9edeb7 | |
parent | a8139d020bcc2492fcea74313613807385534ef8 (diff) | |
download | linux-3f065a1d7cc83800bb68655f6067de71afc5ac62.tar.xz |
xfrm: check id proto in validate_tmpl()
[ Upstream commit 6a53b7593233ab9e4f96873ebacc0f653a55c3e1 ]
syzbot reported a kernel warning in xfrm_state_fini(), which
indicates that we have entries left in the list
net->xfrm.state_all whose proto is zero. And
xfrm_id_proto_match() doesn't consider them as a match with
IPSEC_PROTO_ANY in this case.
Proto with value 0 is probably not a valid value, at least
verify_newsa_info() doesn't consider it valid either.
This patch fixes it by checking the proto value in
validate_tmpl() and rejecting invalid ones, like what iproute2
does in xfrm_xfrmproto_getbyname().
Reported-by: syzbot <syzkaller@googlegroups.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-rw-r--r-- | net/xfrm/xfrm_user.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 30593cadd428..713194a3822f 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1379,6 +1379,21 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family) default: return -EINVAL; } + + switch (ut[i].id.proto) { + case IPPROTO_AH: + case IPPROTO_ESP: + case IPPROTO_COMP: +#if IS_ENABLED(CONFIG_IPV6) + case IPPROTO_ROUTING: + case IPPROTO_DSTOPTS: +#endif + case IPSEC_PROTO_ANY: + break; + default: + return -EINVAL; + } + } return 0; |