Changeset 91796 in vbox for trunk

Timestamp:

Oct 17, 2021 10:29:58 PM (3 years ago)

Author:

vboxsync

Message:

SUPDrv,IPRT,VBoxGuest: Don't export ellipsis functions from SUPDrv, as that makes switching back to the kernel stack unsafe. Exports has changes (added+removed), but not bumping major IOC version as that was done a few hours ago already and it's Sunday. [kmod build fix] bugref:10124

File:

• trunk/include/VBox/sup.h (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -2221 +2221 @@
 SUPR0DECL(int)  SUPR0PrintfV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
-/* Suppress -Winline warnings as (older) gcc refuses to inline functions using va_start:  */
-#if RT_GNUC_PREREQ(4, 2)
-# if RT_GNUC_PREREQ(4, 6)
-#  pragma GCC diagnostic push
-# endif
-# pragma GCC diagnostic ignored "-Winline"
+/* HACK ALERT! linux/compiler_types.h redefines __inline__ to always_inline which causes the compiler (gcc 9.3 and
+               older at least) to barf on the va_list below when SUPR0Printf is used, preventing compiliation of
+               SUPDrv.c among other things.  We have a hack for this in iprt/types.h for pre 4.1 compilers where
+               it would barf even if not used, causing troubles on 2-3 functions in iprt/string.h.  Applying that
+               fix for all gcc versions there would be preferable, however, since a while we include iprt/types.h
+               at the start of the-linux-kernel.h, making that kind of suspect as it may cause breakage...
+               So, chickening out and just working around it here for now. */
+#if defined(__inline__) && defined(RT_OS_LINUX) && defined(__KERNEL__) && defined(__LINUX_COMPILER_TYPES_H)
+/** @todo In the long run, sort this out in a more proper way! */
+# define SUPR0PRINTF_UNDO_INLINE_HACK 1
+# undef __inline__
 #endif
+
 /**
  * Writes to the debugger and/or kernel log.
@@ -2247 +2253 @@
     return 0;
 }
-#if RT_GNUC_PREREQ(4, 6)
-# pragma GCC diagnostic pop
+
+/* HACK ALERT! See above. */
+#ifdef SUPR0PRINTF_UNDO_INLINE_HACK
+# define __inline__ inline
 #endif