Merge pull request #9490 from douzzer/20251202-linuxkm-old-kernel-fixes

20251202-linuxkm-old-kernel-fixes

Author: dgarske

linuxkm/linuxkm_wc_port.h

@@ -116,11 +116,25 @@
         #endif
     #endif
 
+    #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+        /* added by 6bab69c650 */
+        #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
+        #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
+    #endif
+
     /* kernel printf doesn't implement fp. */
     #ifndef WOLFSSL_NO_FLOAT_FMT
         #define WOLFSSL_NO_FLOAT_FMT
     #endif
 
+    #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)) || \
+        (defined(RHEL_MAJOR) && \
+         ((RHEL_MAJOR > 9) || ((RHEL_MAJOR == 9) && (RHEL_MINOR >= 5))))
+        #define WOLFSSL_DEBUG_PRINTF_FN _printk
+    #else
+        #define WOLFSSL_DEBUG_PRINTF_FN printk
+    #endif
+
 #ifndef WOLFSSL_LINUXKM_USE_MUTEXES
     struct wolfSSL_Mutex;
     extern int wc_lkm_LockMutex(struct wolfSSL_Mutex* m);
@@ -250,6 +264,7 @@
     _Pragma("GCC diagnostic ignored \"-Wswitch-enum\"");
     _Pragma("GCC diagnostic ignored \"-Wcast-function-type\""); /* needed for kernel 4.14.336 */
     _Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\""); /* needed for kernel 4.9.282 */
+    _Pragma("GCC diagnostic ignored \"-Wattributes\"");
 
     #include <linux/kconfig.h>
 
@@ -544,9 +559,16 @@
 
         #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
             #include <asm/i387.h>
+            #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
+                /* added by a62b01cd6c */
+                #include <asm-generic/simd.h>
+            #endif
         #else
             #include <asm/simd.h>
-            #include <crypto/internal/simd.h>
+            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
+                /* added by 266d051601 */
+                #include <crypto/internal/simd.h>
+            #endif
         #endif
         #ifndef CAN_SAVE_VECTOR_REGISTERS
             #ifdef DEBUG_VECTOR_REGISTER_ACCESS_FUZZING
@@ -721,6 +743,9 @@
                 struct Signer* GetCAByKeyHash(void* vp, const unsigned char* keyHash);
             #endif /* HAVE_OCSP */
             #ifdef WOLFSSL_AKID_NAME
+                #ifdef WOLFSSL_API_PREFIX_MAP
+                    #define GetCAByAKID wolfSSL_GetCAByAKID
+                #endif
                 struct Signer* GetCAByAKID(void* vp, const unsigned char* issuer,
                                            unsigned int issuerSz,
                                            const unsigned char* serial,
@@ -1264,7 +1289,11 @@
             #endif /* HAVE_OCSP */
         #endif /* NO_SKID */
         #ifdef WOLFSSL_AKID_NAME
-            #define GetCAByAKID WC_PIE_INDIRECT_SYM(GetCAByAKID)
+            #ifdef WOLFSSL_API_PREFIX_MAP
+                #define wolfSSL_GetCAByAKID WC_PIE_INDIRECT_SYM(wolfSSL_GetCAByAKID)
+            #else
+                #define GetCAByAKID WC_PIE_INDIRECT_SYM(GetCAByAKID)
+            #endif
         #endif
 
         #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)

linuxkm/lkcapi_sha_glue.c

@@ -1167,24 +1167,42 @@ static int wc_linuxkm_drbg_generate(struct crypto_rng *tfm,
         }
     }
 
-    ret = wc_RNG_GenerateBlock(&drbg->rng, dst, dlen);
-
-    if (unlikely(ret == WC_NO_ERR_TRACE(RNG_FAILURE_E)) && (! retried)) {
-        retried = 1;
-        wc_FreeRng(&drbg->rng);
-        ret = wc_InitRng(&drbg->rng);
-        if (ret == 0) {
-            pr_warn("WARNING: reinitialized DRBG #%d after RNG_FAILURE_E.", raw_smp_processor_id());
-            goto retry;
+    for (;;) {
+        #define RNG_MAX_BLOCK_LEN_ROUNDED (RNG_MAX_BLOCK_LEN & ~0xfU)
+        if (dlen > RNG_MAX_BLOCK_LEN_ROUNDED) {
+            ret = wc_RNG_GenerateBlock(&drbg->rng, dst, RNG_MAX_BLOCK_LEN_ROUNDED);
+            if (ret == 0) {
+                dlen -= RNG_MAX_BLOCK_LEN_ROUNDED;
+                dst += RNG_MAX_BLOCK_LEN_ROUNDED;
+            }
         }
+        #undef RNG_MAX_BLOCK_LEN_ROUNDED
         else {
-            pr_warn_once("ERROR: reinitialization of DRBG #%d after RNG_FAILURE_E failed with ret %d.", raw_smp_processor_id(), ret);
+            ret = wc_RNG_GenerateBlock(&drbg->rng, dst, dlen);
+            dlen -= dlen;
+        }
+
+        if (unlikely(ret == WC_NO_ERR_TRACE(RNG_FAILURE_E)) && (! retried)) {
+            retried = 1;
+            wc_FreeRng(&drbg->rng);
+            ret = wc_InitRng(&drbg->rng);
+            if (ret == 0) {
+                pr_warn("WARNING: reinitialized DRBG #%d after RNG_FAILURE_E.", raw_smp_processor_id());
+                goto retry;
+            }
+            else {
+                pr_warn_once("ERROR: reinitialization of DRBG #%d after RNG_FAILURE_E failed with ret %d.", raw_smp_processor_id(), ret);
+                ret = -EINVAL;
+            }
+        }
+        else if (ret != 0) {
+            pr_warn_once("WARNING: wc_RNG_GenerateBlock returned %d\n",ret);
             ret = -EINVAL;
+            break;
         }
-    }
-    else if (ret != 0) {
-        pr_warn_once("WARNING: wc_RNG_GenerateBlock returned %d\n",ret);
-        ret = -EINVAL;
+
+        if (! dlen)
+            break;
     }
 
 out:

wolfssl/internal.h

@@ -6698,10 +6698,11 @@ WOLFSSL_LOCAL WC_RNG* WOLFSSL_RSA_GetRNG(WOLFSSL_RSA *rsa, WC_RNG **tmpRNG,
     #ifndef GetCA
         WOLFSSL_LOCAL Signer* GetCA(void* vp, byte* hash);
     #endif
-    #if defined(WOLFSSL_AKID_NAME) && !defined(GetCAByAKID)
-        #ifdef WOLFSSL_API_PREFIX_MAP
-            #define GetCAByAKID wolfSSL_GetCAByAKID
-        #endif
+    #if defined(WOLFSSL_AKID_NAME) && !defined(WC_SYM_RELOC_TABLES)
+        /* note WOLFSSL_API_PREFIX_MAPping is in asn.h, and if
+         * WC_SYM_RELOC_TABLES, the prototype is in the port layer
+         * (e.g. linuxkm_wc_port.h), to allow shimming.
+         */
         WOLFSSL_TEST_VIS Signer* GetCAByAKID(void* vp, const byte* issuer,
                 word32 issuerSz, const byte* serial, word32 serialSz);
     #endif

wolfssl/wolfcrypt/asn.h

@@ -2084,6 +2084,13 @@ typedef enum MimeStatus
     #define SetAlgoID wc_SetAlgoID
     #define SetAsymKeyDer wc_SetAsymKeyDer
     #define CalcHashId wc_CalcHashId
+    #if defined(WOLFSSL_AKID_NAME) && !defined(GetCAByAKID)
+        /* GetCAByAKID() has two implementations, a full implementation in
+         * src/ssl.c, and a dummy implementation in wolfcrypt/src/asn.c for
+         * WOLFCRYPT_ONLY builds.
+         */
+        #define GetCAByAKID wolfSSL_GetCAByAKID
+    #endif
 #endif /* WOLFSSL_API_PREFIX_MAP */
 
 WOLFSSL_LOCAL int HashIdAlg(word32 oidSum);

wolfssl/wolfcrypt/logging.h

@@ -505,7 +505,7 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
  * For custom debugging output, define your own WOLFSSL_DEBUG_PRINTF_FN
  */
 #ifdef WOLFSSL_DEBUG_PRINTF_FN
-    /* user-supplied definition */
+    /* user- or port-supplied definition */
 #elif defined(ARDUINO)
     /* ARDUINO only has print and sprintf, no printf. */
 #elif defined(__WATCOMC__)
@@ -548,8 +548,6 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
     #define WOLFSSL_DEBUG_PRINTF_FIRST_ARGS ANDROID_LOG_VERBOSE, "[wolfSSL]",
 #elif defined(WOLFSSL_XILINX)
     #define WOLFSSL_DEBUG_PRINTF_FN xil_printf
-#elif defined(WOLFSSL_LINUXKM)
-    #define WOLFSSL_DEBUG_PRINTF_FN printk
 #elif defined(WOLFSSL_RENESAS_RA6M4)
     #define WOLFSSL_DEBUG_PRINTF_FN myprintf
 #elif defined(NO_STDIO_FILESYSTEM)