xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit c301f0981fdd3fd1ffac6836b423c4d7a8e0eb63 upstream.

The problem is in nft_byteorder_eval() where we are iterating through a
loop and writing to dst[0], dst[1], dst[2] and so on...  On each
iteration we are writing 8 bytes.  But dst[] is an array of u32 so each
element only has space for 4 bytes.  That means that every iteration
overwrites part of the previous element.

I spotted this bug while reviewing commit caf3ef7468f7 ("netfilter:
nf_tables: prevent OOB access in nft_byteorder_eval") which is a related
issue.  I think that the reason we have not detected this bug in testing
is that most of time we only write one element.

Fixes: ce1e7989d9 ("netfilter: nft_byteorder: provide 64bit le/be conversion")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
[Ajay: Modified to apply on v5.10.y]
Signed-off-by: Ajay Kaher <ajay.kaher@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter
2023-11-03 09:42:51 +03:00
committed by Greg Kroah-Hartman
parent 67f386f756
commit 9a865a11d6
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/netfilter/nf_tables.h
View File

@@ -142,9 +142,9 @@ static inline u16 nft_reg_load16(const u32 *sreg)
return *(u16 *)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) static inline u64 nft_reg_load64(const u32 *sreg)

5
net/netfilter/nft_byteorder.c
View File

@@ -38,20 +38,21 @@ void nft_byteorder_eval(const struct nft_expr *expr,
switch (priv->size) { switch (priv->size) {
case 8: { case 8: {
u64 *dst64 = (void *)dst;
u64 src64; u64 src64;
switch (priv->op) { switch (priv->op) {
case NFT_BYTEORDER_NTOH: case NFT_BYTEORDER_NTOH:
for (i = 0; i < priv->len / 8; i++) { for (i = 0; i < priv->len / 8; i++) {
src64 = nft_reg_load64(&src[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; break;
case NFT_BYTEORDER_HTON: case NFT_BYTEORDER_HTON:
for (i = 0; i < priv->len / 8; i++) { for (i = 0; i < priv->len / 8; i++) {
src64 = (__force __u64) src64 = (__force __u64)
cpu_to_be64(nft_reg_load64(&src[i])); cpu_to_be64(nft_reg_load64(&src[i]));
nft_reg_store64(&dst[i], src64); nft_reg_store64(&dst64[i], src64);
} }
break; break;
} }

2
net/netfilter/nft_meta.c
View File

@@ -63,7 +63,7 @@ nft_meta_get_eval_time(enum nft_meta_keys key,
{ {
switch (key) { switch (key) {
case NFT_META_TIME_NS: case NFT_META_TIME_NS:
nft_reg_store64(dest, ktime_get_real_ns()); nft_reg_store64((u64 *)dest, ktime_get_real_ns());
break; break;
case NFT_META_TIME_DAY: case NFT_META_TIME_DAY:
nft_reg_store8(dest, nft_meta_weekday()); nft_reg_store8(dest, nft_meta_weekday());