diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 419c247570..ec4fa8b731 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 44ae2d3522..c31cdf2f83 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8f056d2957..8aeda074a9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -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 diff --git a/linux-6.1.11/include/net/netfilter/nf_tables.h b/linux-6.1.11/include/net/netfilter/nf_tables.h index 1daededfa7..2333e9473b 100644 --- a/linux-6.1.11/include/net/netfilter/nf_tables.h +++ b/linux-6.1.11/include/net/netfilter/nf_tables.h @@ -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) diff --git a/linux-6.1.11/net/netfilter/nft_byteorder.c b/linux-6.1.11/net/netfilter/nft_byteorder.c index f952a80275..9fbe94f298 100644 --- a/linux-6.1.11/net/netfilter/nft_byteorder.c +++ b/linux-6.1.11/net/netfilter/nft_byteorder.c @@ -38,13 +38,14 @@ 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; @@ -52,7 +53,7 @@ void nft_byteorder_eval(const struct nft_expr *expr, 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; } diff --git a/linux-6.1.11/net/netfilter/nft_meta.c b/linux-6.1.11/net/netfilter/nft_meta.c index 55d2d49c34..6e83321926 100644 --- a/linux-6.1.11/net/netfilter/nft_meta.c +++ b/linux-6.1.11/net/netfilter/nft_meta.c @@ -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());