Skip to content

Fix potential vulnerable cloned functions #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
npt-1707 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix potential vulnerable cloned functions #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6548a7a
Bump dawidd6/action-download-artifact from 7 to 8
dependabot[bot] Jan 23, 2025
4914b29
Merge pull request #35 from QQxiaoming/dependabot/github_actions/dawi…
QQxiaoming Jan 24, 2025
bc88a47
Bump dawidd6/action-download-artifact from 8 to 9
dependabot[bot] Feb 28, 2025
6777a74
Merge pull request #36 from QQxiaoming/dependabot/github_actions/dawi…
QQxiaoming Feb 28, 2025
a2c0d41
linux-6.1.11: netfilter: nf_tables: fix pointer math issue in nft_byt…
npt-1707 Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-20.04
if: github.event.workflow_run.conclusion == 'success'
steps:
- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
run: |
brew install create-dmg

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: qemu_macos

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
runs-on: ubuntu-20.04
if: github.event.workflow_run.conclusion == 'success'
steps:
- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: qemu_w64

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
4 changes: 2 additions & 2 deletions linux-6.1.11/include/net/netfilter/nf_tables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ static inline __be32 nft_reg_load_be32(const u32 *sreg)
return *(__force __be32 *)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)
Expand Down
5 changes: 3 additions & 2 deletions linux-6.1.11/net/netfilter/nft_byteorder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,22 @@ 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],
nft_reg_store64(&dst64[i],
be64_to_cpu((__force __be64)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;
}
Expand Down
2 changes: 1 addition & 1 deletion linux-6.1.11/net/netfilter/nft_meta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down