Unverified Commit 9d26fa52 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2153 netfilter: nftables: exthdr: fix 4-byte stack OOB write 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DCDPD5Q2BNS6UZ3PIDHMGH3BVVNYLCMH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I80I0G 
 
Link:https://gitee.com/openeuler/kernel/pulls/2153

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 518d7451 006b199f

net/netfilter/nft_exthdr.c

+12 −5
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ static unsigned int optlen(const u8 *opt, unsigned int offset) 
		return opt[offset + 1];

}



static int nft_skb_copy_to_reg(const struct sk_buff *skb, int offset, u32 *dest, unsigned int len)

{

	if (len % NFT_REG32_SIZE)

		dest[len / NFT_REG32_SIZE] = 0;



	return skb_copy_bits(skb, offset, dest, len);

}



static void nft_exthdr_ipv6_eval(const struct nft_expr *expr,

				 struct nft_regs *regs,

				 const struct nft_pktinfo *pkt)
@@ -54,8 +62,7 @@ static void nft_exthdr_ipv6_eval(const struct nft_expr *expr, 
	}

	offset += priv->offset;



	dest[priv->len / NFT_REG32_SIZE] = 0;

	if (skb_copy_bits(pkt->skb, offset, dest, priv->len) < 0)

	if (nft_skb_copy_to_reg(pkt->skb, offset, dest, priv->len) < 0)

		goto err;

	return;

err:
@@ -151,8 +158,7 @@ static void nft_exthdr_ipv4_eval(const struct nft_expr *expr, 
	}

	offset += priv->offset;



	dest[priv->len / NFT_REG32_SIZE] = 0;

	if (skb_copy_bits(pkt->skb, offset, dest, priv->len) < 0)

	if (nft_skb_copy_to_reg(pkt->skb, offset, dest, priv->len) < 0)

		goto err;

	return;

err:
@@ -208,6 +214,7 @@ static void nft_exthdr_tcp_eval(const struct nft_expr *expr, 
		if (priv->flags & NFT_EXTHDR_F_PRESENT) {

			*dest = 1;

		} else {

			if (priv->len % NFT_REG32_SIZE)

				dest[priv->len / NFT_REG32_SIZE] = 0;

			memcpy(dest, opt + offset, priv->len);

		}