Unverified Commit 5b9222cd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4100 netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MSKVKD6CJN346PQUXPTDOQTW2ISV3FSC/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8WQRG 
 
Link:https://gitee.com/openeuler/kernel/pulls/4100

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 00a44e28 c486384a

include/net/netfilter/nf_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ static inline u16 nft_reg_load16(const u32 *sreg) 
	return *(u16 *)sreg;

}



static inline void nft_reg_store64(u32 *dreg, u64 val)

static inline void nft_reg_store64(u64 *dreg, u64 val)

{

	put_unaligned(val, (u64 *)dreg);

	put_unaligned(val, dreg);

}



static inline u64 nft_reg_load64(const u32 *sreg)

net/netfilter/nft_byteorder.c

+3 −2
Original line number Diff line number Diff line
@@ -38,20 +38,21 @@ void nft_byteorder_eval(const struct nft_expr *expr, 


	switch (priv->size) {

	case 8: {

		u64 *dst64 = (void *)dst;

		u64 src64;



		switch (priv->op) {

		case NFT_BYTEORDER_NTOH:

			for (i = 0; i < priv->len / 8; i++) {

				src64 = nft_reg_load64(&src[i]);

				nft_reg_store64(&dst[i], be64_to_cpu(src64));

				nft_reg_store64(&dst64[i], be64_to_cpu(src64));

			}

			break;

		case NFT_BYTEORDER_HTON:

			for (i = 0; i < priv->len / 8; i++) {

				src64 = (__force __u64)

					cpu_to_be64(nft_reg_load64(&src[i]));

				nft_reg_store64(&dst[i], src64);

				nft_reg_store64(&dst64[i], src64);

			}

			break;

		}

net/netfilter/nft_meta.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ nft_meta_get_eval_time(enum nft_meta_keys key, 
{

	switch (key) {

	case NFT_META_TIME_NS:

		nft_reg_store64(dest, ktime_get_real_ns());

		nft_reg_store64((u64 *)dest, ktime_get_real_ns());

		break;

	case NFT_META_TIME_DAY:

		nft_reg_store8(dest, nft_meta_weekday());