diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-16 19:39:36 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-16 19:39:37 +0100 |
| commit | 186abea8a80b7699a05bbe6cbd661d64f887e1a0 (patch) | |
| tree | 6209d1da77d135869a81ec87638360e7597d3a8a /net/ipv6 | |
| parent | Merge tag 'wireless-2022-03-16' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | esp6: fix check on ipv6_skip_exthdr's return value (diff) | |
| download | linux-186abea8a80b7699a05bbe6cbd661d64f887e1a0.tar.xz linux-186abea8a80b7699a05bbe6cbd661d64f887e1a0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2022-03-16
1) Fix a kernel-info-leak in pfkey.
From Haimin Zhang.
2) Fix an incorrect check of the return value of ipv6_skip_exthdr.
From Sabrina Dubroca.
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec:
esp6: fix check on ipv6_skip_exthdr's return value
af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
====================
Link: https://lore.kernel.org/r/20220316121142.3142336-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/esp6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index b0ffbcd5432d..55d604c9b3b3 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -812,8 +812,7 @@ int esp6_input_done2(struct sk_buff *skb, int err) struct tcphdr *th; offset = ipv6_skip_exthdr(skb, offset, &nexthdr, &frag_off); - - if (offset < 0) { + if (offset == -1) { err = -EINVAL; goto out; } |