Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / nvidia-open
Commits:
a5ecd817 by Jan Alexander Steffens (heftig) at 2024-01-10T00:35:26+01:00
545.29.06-10: linux 6.7.arch1-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + nvidia-open-tfm-ctx-aligned.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = nvidia-open
pkgdesc = NVIDIA open kernel modules
pkgver = 545.29.06
- pkgrel = 9
+ pkgrel = 10
url = https://github.com/NVIDIA/open-gpu-kernel-modules
arch = x86_64
license = GPL
@@ -12,8 +12,10 @@ pkgbase = nvidia-open
options = !buildflags
source =
nvidia-open-545.29.06.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/545.29.06.tar.gz
source = nvidia-open-gcc-ibt-sls.patch
+ source = nvidia-open-tfm-ctx-aligned.patch
sha512sums =
f8df8516d00ee3210b3a844493f74f0337cf50cd88884ff11ba6a1de58384674dc7ab7390f98765ecb805fa792e0b5eee71f7384ddb55a739e4292cad8774302
sha512sums =
263c4c5e75ef8cb8ca2641c022dfaf8bd9222fadf68ed15120b0ae7dd9cc901a04ce2e55625d513a0995759c9d82dfbdc4c33d4751159124915d7404b1400e34
+ sha512sums =
e45e2e588298e15e6ab114b88181431189b79ca8454ac8ead666deaa48fd49f11953acb32ce365a429112827e889c30e4a0bc89027a0164f6c211088dd7cad5b
pkgname = nvidia-open
depends = nvidia-utils=545.29.06
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
pkgbase=nvidia-open
pkgname=(nvidia-open nvidia-open-dkms)
pkgver=545.29.06
-pkgrel=9
+pkgrel=10
pkgdesc="NVIDIA open kernel modules"
arch=('x86_64')
url="https://github.com/NVIDIA/open-gpu-kernel-modules";
@@ -11,9 +11,11 @@ makedepends=('linux-headers')
license=('GPL')
options=('!lto' '!buildflags')
source=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${pkgver}.tar.gz";
- nvidia-open-gcc-ibt-sls.patch)
+ nvidia-open-gcc-ibt-sls.patch
+ nvidia-open-tfm-ctx-aligned.patch)
sha512sums=('f8df8516d00ee3210b3a844493f74f0337cf50cd88884ff11ba6a1de58384674dc7ab7390f98765ecb805fa792e0b5eee71f7384ddb55a739e4292cad8774302'
-
'263c4c5e75ef8cb8ca2641c022dfaf8bd9222fadf68ed15120b0ae7dd9cc901a04ce2e55625d513a0995759c9d82dfbdc4c33d4751159124915d7404b1400e34')
+
'263c4c5e75ef8cb8ca2641c022dfaf8bd9222fadf68ed15120b0ae7dd9cc901a04ce2e55625d513a0995759c9d82dfbdc4c33d4751159124915d7404b1400e34'
+
'e45e2e588298e15e6ab114b88181431189b79ca8454ac8ead666deaa48fd49f11953acb32ce365a429112827e889c30e4a0bc89027a0164f6c211088dd7cad5b')
prepare() {
cd open-gpu-kernel-modules-${pkgver}
@@ -21,6 +23,9 @@ prepare() {
# Fix for https://bugs.archlinux.org/task/74886
patch -Np1 --no-backup-if-mismatch -i "$srcdir"/nvidia-open-gcc-ibt-sls.patch
+ # Fix for https://github.com/NVIDIA/open-gpu-kernel-modules/issues/574
+ patch -Np1 --no-backup-if-mismatch -i
"$srcdir"/nvidia-open-tfm-ctx-aligned.patch
+
# Attempt to make this reproducible
sed -i "s/^HOSTNAME.*/HOSTNAME = echo archlinux"/ utils.mk
sed -i "s/^WHOAMI.*/WHOAMI = echo archlinux-builder"/ utils.mk
=====================================
nvidia-open-tfm-ctx-aligned.patch
=====================================
@@ -0,0 +1,18 @@
+ kernel-open/nvidia/libspdm_shash.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git c/kernel-open/nvidia/libspdm_shash.c
i/kernel-open/nvidia/libspdm_shash.c
+index 10e9bff..d0ef6b2 100644
+--- c/kernel-open/nvidia/libspdm_shash.c
++++ i/kernel-open/nvidia/libspdm_shash.c
+@@ -87,8 +87,8 @@ bool lkca_hmac_duplicate(struct shash_desc *dst, struct
shash_desc const *src)
+
+ struct crypto_shash *src_tfm = src->tfm;
+ struct crypto_shash *dst_tfm = dst->tfm;
+- char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base);
+- char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base);
++ char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base,
crypto_tfm_alg_alignmask(&src_tfm->base) + 1);
++ char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base,
crypto_tfm_alg_alignmask(&dst_tfm->base) + 1);
+ int ss = crypto_shash_statesize(dst_tfm);
+ memcpy(dst_ipad, src_ipad, crypto_shash_blocksize(src->tfm));
+ memcpy(dst_ipad + ss, src_ipad + ss,
crypto_shash_blocksize(src->tfm));
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-open/-/commit/a5ecd81713ec25688102b265b0d00717fe73de00
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-open/-/commit/a5ecd81713ec25688102b265b0d00717fe73de00
You're receiving this email because of your account on gitlab.archlinux.org.
