diff options
| author | Herbert Xu | 2023-01-10 08:59:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2023-01-18 11:58:19 +0100 |
| commit | 0afa5f0736584411771299074bbeca8c1f9706d4 (patch) | |
| tree | c40b2979fd0c10f0431df3993c63d9a8e0bf5f9c /net/ipv6 | |
| parent | c49996c6aa03590e4ef5add8772cb6068d99fd59 (diff) | |
ipv6: raw: Deduct extension header length in rawv6_push_pending_frames
commit cb3e9864cdbe35ff6378966660edbcbac955fe17 upstream.
The total cork length created by ip6_append_data includes extension
headers, so we must exclude them when comparing them against the
IPV6_CHECKSUM offset which does not include extension headers.
Reported-by: Kyle Zeng <zengyhkyle@gmail.com>
Fixes: 357b40a18b04 ("[IPV6]: IPV6_CHECKSUM socket option can corrupt kernel memory")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/raw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 722de9dd0ff7..8ffeac745656 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -505,6 +505,7 @@ csum_copy_err: static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, struct raw6_sock *rp) { + struct ipv6_txoptions *opt; struct sk_buff *skb; int err = 0; int offset; @@ -522,6 +523,9 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, offset = rp->offset; total_len = inet_sk(sk)->cork.base.length; + opt = inet6_sk(sk)->cork.opt; + total_len -= opt ? opt->opt_flen : 0; + if (offset >= total_len - 1) { err = -EINVAL; ip6_flush_pending_frames(sk); |