Skip to content

Commit 607d5d7

Browse files
philljjphilljj
authored
Merge pull request wolfSSL#8994 from douzzer/20250711-linuxkm-distro-fix
20250711-linuxkm-distro-fix
2 parents 70bdd9f + 0001bf7 commit 607d5d7

9 files changed

+279
-262
lines changed

‎linuxkm/include.am‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,11 @@ EXTRA_DIST += m4/ax_linuxkm.m4 \
2020
linuxkm/lkcapi_dh_glue.c \
2121
linuxkm/lkcapi_ecdsa_glue.c \
2222
linuxkm/lkcapi_ecdh_glue.c \
23-
linuxkm/lkcapi_rsa_glue.c
23+
linuxkm/lkcapi_rsa_glue.c \
24+
linuxkm/patches/5.10.17/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v10v17.patch \
25+
linuxkm/patches/5.10.236/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v10v236.patch \
26+
linuxkm/patches/5.15/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v15.patch \
27+
linuxkm/patches/5.17/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v17.patch \
28+
linuxkm/patches/6.1.73/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-6v1v73.patch \
29+
linuxkm/patches/6.12/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-6v12.patch \
30+
linuxkm/patches/6.15/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-6v15.patch

‎linuxkm/patches/5.10.17/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v10v17.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./drivers/char/random.c.dist 2020-12-13 16:41:30.000000000 -0600
2-
+++ ./drivers/char/random.c 2025-07-02 11:59:07.220250957 -0500
1+
--- 5.10.17/drivers/char/random.c.dist 2020-12-13 16:41:30.000000000 -0600
2+
+++ 5.10.17/drivers/char/random.c 2025-07-02 11:59:07.220250957 -0500
33
@@ -344,6 +344,260 @@
44
#include <asm/irq_regs.h>
55
#include <asm/io.h>
@@ -421,8 +421,8 @@
421421
if (flags & GRND_NONBLOCK)
422422
return -EAGAIN;
423423
ret = wait_for_random_bytes();
424-
--- ./include/linux/random.h.dist 2020-12-13 16:41:30.000000000 -0600
425-
+++ ./include/linux/random.h 2025-06-30 12:05:59.106440700 -0500
424+
--- 5.10.17/include/linux/random.h.dist 2020-12-13 16:41:30.000000000 -0600
425+
+++ 5.10.17/include/linux/random.h 2025-06-30 12:05:59.106440700 -0500
426426
@@ -158,4 +158,37 @@ static inline bool __init arch_get_rando
427427
}
428428
#endif

‎linuxkm/patches/5.10.236/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v10v236.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./drivers/char/random.c.dist 2025-04-29 18:54:03.390121890 -0500
2-
+++ ./drivers/char/random.c 2025-07-02 11:57:40.176497765 -0500
1+
--- 5.10.236/drivers/char/random.c.dist 2025-04-29 18:54:03.390121890 -0500
2+
+++ 5.10.236/drivers/char/random.c 2025-07-02 11:57:40.176497765 -0500
33
@@ -60,6 +60,260 @@
44
#include <asm/irq_regs.h>
55
#include <asm/io.h>
@@ -420,8 +420,8 @@
420420
if (!crng_ready())
421421
return -ENODATA;
422422
crng_reseed();
423-
--- ./include/linux/random.h.dist 2025-04-29 18:54:07.595202807 -0500
424-
+++ ./include/linux/random.h 2025-06-30 12:03:15.263141842 -0500
423+
--- 5.10.236/include/linux/random.h.dist 2025-04-29 18:54:07.595202807 -0500
424+
+++ 5.10.236/include/linux/random.h 2025-06-30 12:03:15.263141842 -0500
425425
@@ -138,4 +138,37 @@ int random_online_cpu(unsigned int cpu);
426426
extern const struct file_operations random_fops, urandom_fops;
427427
#endif

‎linuxkm/patches/5.15/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v15.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./drivers/char/random.c.dist 2021-10-31 15:53:10.000000000 -0500
2-
+++ ./drivers/char/random.c 2025-07-02 11:49:13.836320539 -0500
1+
--- 5.15/drivers/char/random.c.dist 2021-10-31 15:53:10.000000000 -0500
2+
+++ 5.15/drivers/char/random.c 2025-07-02 11:49:13.836320539 -0500
33
@@ -344,6 +344,260 @@
44
#include <asm/irq_regs.h>
55
#include <asm/io.h>
@@ -411,8 +411,8 @@
411411
if (flags & GRND_NONBLOCK)
412412
return -EAGAIN;
413413
ret = wait_for_random_bytes();
414-
--- ./include/linux/random.h.dist 2021-10-31 15:53:10.000000000 -0500
415-
+++ ./include/linux/random.h 2025-06-28 13:09:13.392547118 -0500
414+
--- 5.15/include/linux/random.h.dist 2021-10-31 15:53:10.000000000 -0500
415+
+++ 5.15/include/linux/random.h 2025-06-28 13:09:13.392547118 -0500
416416
@@ -158,4 +158,37 @@ static inline bool __init arch_get_rando
417417
}
418418
#endif

‎linuxkm/patches/5.17/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-5v17.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./drivers/char/random.c.dist 2022-05-31 08:33:43.006547419 -0500
2-
+++ ./drivers/char/random.c 2025-07-02 11:42:10.098166804 -0500
1+
--- 5.17/drivers/char/random.c.dist 2022-05-31 08:33:43.006547419 -0500
2+
+++ 5.17/drivers/char/random.c 2025-07-02 11:42:10.098166804 -0500
33
@@ -60,6 +60,260 @@
44
#include <asm/irq_regs.h>
55
#include <asm/io.h>
@@ -420,8 +420,8 @@
420420
if (!crng_ready())
421421
return -ENODATA;
422422
crng_reseed();
423-
--- ./include/linux/random.h.dist 2022-05-31 08:33:43.007547457 -0500
424-
+++ ./include/linux/random.h 2025-06-30 12:06:15.219731761 -0500
423+
--- 5.17/include/linux/random.h.dist 2022-05-31 08:33:43.007547457 -0500
424+
+++ 5.17/include/linux/random.h 2025-06-30 12:06:15.219731761 -0500
425425
@@ -138,4 +138,37 @@ int random_online_cpu(unsigned int cpu);
426426
extern const struct file_operations random_fops, urandom_fops;
427427
#endif

‎linuxkm/patches/6.1.73/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-6v1v73.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./drivers/char/random.c.dist 2024-01-19 16:25:03.754138321 -0600
2-
+++ ./drivers/char/random.c 2025-07-03 15:51:24.282595676 -0500
1+
--- 6.1.73/drivers/char/random.c.dist 2024-01-19 16:25:03.754138321 -0600
2+
+++ 6.1.73/drivers/char/random.c 2025-07-03 15:51:24.282595676 -0500
33
@@ -60,6 +60,260 @@
44
#include <asm/irq_regs.h>
55
#include <asm/io.h>
@@ -433,8 +433,8 @@
433433
if (!crng_ready())
434434
return -ENODATA;
435435
crng_reseed();
436-
--- ./include/linux/random.h.dist 2024-01-19 16:25:07.891223702 -0600
437-
+++ ./include/linux/random.h 2025-06-30 12:38:54.353341542 -0500
436+
--- 6.1.73/include/linux/random.h.dist 2024-01-19 16:25:07.891223702 -0600
437+
+++ 6.1.73/include/linux/random.h 2025-06-30 12:38:54.353341542 -0500
438438
@@ -202,4 +202,37 @@ int random_online_cpu(unsigned int cpu);
439439
extern const struct file_operations random_fops, urandom_fops;
440440
#endif

‎linuxkm/patches/6.12/WOLFSSL_LINUXKM_HAVE_GET_RANDOM_CALLBACKS-6v12.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./drivers/char/random.c.dist 2025-01-19 19:03:47.877152701 -0600
2-
+++ ./drivers/char/random.c 2025-07-02 10:40:21.994303997 -0500
1+
--- 6.12/drivers/char/random.c.dist 2025-01-19 19:03:47.877152701 -0600
2+
+++ 6.12/drivers/char/random.c 2025-07-02 10:40:21.994303997 -0500
33
@@ -67,6 +67,260 @@
44
#include <asm/irq_regs.h>
55
#include <asm/io.h>
@@ -442,8 +442,8 @@
442442
if (!crng_ready())
443443
return -ENODATA;
444444
crng_reseed(NULL);
445-
--- ./include/linux/random.h.dist 2025-01-19 19:03:57.524328914 -0600
446-
+++ ./include/linux/random.h 2025-06-30 12:04:32.801676104 -0500
445+
--- 6.12/include/linux/random.h.dist 2025-01-19 19:03:57.524328914 -0600
446+
+++ 6.12/include/linux/random.h 2025-06-30 12:04:32.801676104 -0500
447447
@@ -161,4 +161,37 @@ int random_online_cpu(unsigned int cpu);
448448
extern const struct file_operations random_fops, urandom_fops;
449449
#endif

0 commit comments

Comments
 (0)