Merge pull request #9381 from douzzer/20251104-fixes

20251104-fixes

Author: philljj

linuxkm/linuxkm_wc_port.h

@@ -1398,7 +1398,7 @@
             return 0;
         }
 
-        static inline int wc_LockMutex(wolfSSL_Mutex* m)
+        static __must_check inline int wc_LockMutex(wolfSSL_Mutex* m)
         {
             if (in_nmi() || hardirq_count() || in_softirq())
                 return -1;
@@ -1443,14 +1443,14 @@
         /* wc_lkm_LockMutex() can't be used inline in __PIE__ objects, due to
          * direct access to pv_ops.
          */
-        static __always_inline int wc_LockMutex(wolfSSL_Mutex *m)
+        static __must_check __always_inline int wc_LockMutex(wolfSSL_Mutex *m)
         {
             return WC_PIE_INDIRECT_SYM(wc_lkm_LockMutex)(m);
         }
 
         #else /* !__PIE__ */
 
-        static __always_inline int wc_LockMutex(wolfSSL_Mutex *m)
+        static __must_check __always_inline int wc_LockMutex(wolfSSL_Mutex *m)
         {
             return wc_lkm_LockMutex(m);
         }

linuxkm/module_hooks.c

@@ -172,11 +172,14 @@ int wc_lkm_LockMutex(wolfSSL_Mutex* m)
     }
     else {
         for (;;) {
+            int sig_ret = wc_linuxkm_check_for_intr_signals();
+            if (sig_ret)
+                return sig_ret;
+            cond_resched();
             if (spin_trylock_irqsave(&m->lock, irq_flags)) {
                 m->irq_flags = irq_flags;
                 return 0;
             }
-            cond_resched();
         }
     }
     __builtin_unreachable();

wolfcrypt/src/asn.c

@@ -13510,7 +13510,11 @@ int wc_Ed25519PublicKeyToDer(const ed25519_key* key, byte* output, word32 inLen,
         return BAD_FUNC_ARG;
     }
 
+    #if defined(HAVE_FIPS) && FIPS_VERSION3_LT(7,0,0)
+    ret = wc_ed25519_export_public((ed25519_key *)key, pubKey, &pubKeyLen);
+    #else
     ret = wc_ed25519_export_public(key, pubKey, &pubKeyLen);
+    #endif
     if (ret == 0) {
         ret = SetAsymKeyDerPublic(pubKey, pubKeyLen, output, inLen,
             ED25519k, withAlg);