crun/1465.patch
Jindrich Novy 1d9c886738 link crun with embedded yajl statically in RHEL10
Resolves: RHEL-35583

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-05-09 13:57:57 +02:00

59 lines
2.0 KiB
Diff

From 8c80ab9b1562dfaa0bebcc8fa1414ec2637704de Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 7 May 2024 17:37:58 +0200
Subject: [PATCH 1/4] utils: initialize fd
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
src/libcrun/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libcrun/utils.c b/src/libcrun/utils.c
index 884f71e61..2b27b078c 100644
--- a/src/libcrun/utils.c
+++ b/src/libcrun/utils.c
@@ -1037,7 +1037,7 @@ read_all_fd_with_size_hint (int fd, const char *description, char **out, size_t
int
read_all_file_at (int dirfd, const char *path, char **out, size_t *len, libcrun_error_t *err)
{
- cleanup_close int fd;
+ cleanup_close int fd = -1;
fd = TEMP_FAILURE_RETRY (openat (dirfd, path, O_RDONLY | O_CLOEXEC));
if (UNLIKELY (fd < 0))
From dd9428b2106bd192659f3d0a3d2c8a7087a5d8f2 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 7 May 2024 17:40:26 +0200
Subject: [PATCH 2/4] blake3: initialize chunks_array
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
src/libcrun/blake3/blake3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libcrun/blake3/blake3.c b/src/libcrun/blake3/blake3.c
index 692f4b021..74fb485ec 100644
--- a/src/libcrun/blake3/blake3.c
+++ b/src/libcrun/blake3/blake3.c
@@ -174,7 +174,7 @@ INLINE size_t compress_chunks_parallel(const uint8_t *input, size_t input_len,
assert(input_len <= MAX_SIMD_DEGREE * BLAKE3_CHUNK_LEN);
#endif
- const uint8_t *chunks_array[MAX_SIMD_DEGREE];
+ const uint8_t *chunks_array[MAX_SIMD_DEGREE] = {0, };
size_t input_position = 0;
size_t chunks_array_len = 0;
while (input_len - input_position >= BLAKE3_CHUNK_LEN) {
From f00fa22789b722ebe3aa663e69bed6f359f05feb Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 7 May 2024 15:18:40 +0200
Subject: [PATCH 3/4] libocispec: sync from upstream
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
libocispec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)