fix_*_init.cocci: fix missing desgnated inits

The 'rcp_hal_init' filter needs recountdiff from patchutils!

Signed-off-by: Mathias Krause <minipli@grsecurity.net>

Author: minipli-oss

src/nvidia/cocci.sh

@@ -50,6 +50,21 @@ pfunc_list_filter() {
 	esac
 }
 
+rpc_hal_init_filter() {
+	# What a hack, take 2!
+	#
+	# To modify structure initialization to use designated initializers, we
+	# post-process a cocci patch that simply removes the init to inject
+	# lines that add the correct initialization, based on the fact that the
+	# field member is mentioned in a trailing comment. To make that a valid
+	# diff, we fix it up using recountdiff.
+	case "$1" in
+		pre)	;;
+		diff)	sed 's|^-\( *\)\([^ ]\+\), *// *\([^ ]\+\)$|&\n+\1.\3 = \2,|' | recountdiff; ;;
+		post)	;;
+	esac
+}
+
 null_filter() {
 	case "$1" in
 		pre)	;;
@@ -82,7 +97,9 @@ fi
 SCRIPT=$1; shift
 SPATCH=$1; shift
 
-if ! check_prog "$SPATCH" coccinelle; then
+if ! check_prog "$SPATCH" coccinelle || \
+   ! check_prog recountdiff patchutils;
+then
 	echo >&2 "error: missing required programs!"
 	exit 2
 fi

src/nvidia/fix_hal_iface_init.cocci

@@ -0,0 +1,24 @@
+// Coccinelle script to fix structure initialization to use designated
+// initializer to make these compatible with Linux's RANDSTRUCT.
+//
+// Here we handle instances of HAL_IFACE_SETUP:
+//
+//   typedef struct {
+//       void (*rpcHalIfacesSetupFn)(PRPC_HAL_IFACES pRpcHal);
+//       void (*rpcstructurecopyHalIfacesSetupFn)(PRPCSTRUCTURECOPY_HAL_IFACES pRpcstructurecopyHal);
+//   } HAL_IFACE_SETUP
+//
+// We simply hard-code the field names.
+//
+// (c) 2026 Open Source Security, Inc. All Rights Reserved.
+
+@@
+identifier his;
+identifier f1, f2;
+@@
+ static HAL_IFACE_SETUP his = {
+-	f1,
+-	f2,
++   .rpcHalIfacesSetupFn = f1,
++	.rpcstructurecopyHalIfacesSetupFn = f2,
+ };

src/nvidia/fix_rpc_hal_init.cocci

@@ -0,0 +1,23 @@
+// Coccinelle script to fix structure initialization to use designated
+// initializer to make these compatible with Linux's RANDSTRUCT.
+//
+// As coccinelle has no support for referencing a field's member name, we
+// post-process the patch with a sed script to do just that (the field name is
+// mentioned by a trailing comment).
+//
+// (c) 2026 Open Source Security, Inc. All Rights Reserved.
+
+@@
+typedef RPC_HAL_IFACES, RPCSTRUCTURECOPY_HAL_IFACES;
+identifier id;
+@@
+
+ static
+(
+ RPC_HAL_IFACES
+|
+ RPCSTRUCTURECOPY_HAL_IFACES
+)
+ id = {
+-	...
+ };