From b930189c06290a23aba177687b2f123590323be1 Mon Sep 17 00:00:00 2001
From: Pavel Cahyna <pcahyna@redhat.com>
Date: Sun, 26 Feb 2023 22:34:23 +0100
Subject: Update the fix for CVE-2022-37704

In the case of xfsdump(8), the check for dump(8) options was invoked
instead of the check for the xfsdump(8). This broke legitimate use of
xfsdump, while leaving the vulnerability open.
---
 client-src/rundump.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client-src/rundump.c b/client-src/rundump.c
index 2d4dd8fba..295b09951 100644
--- a/client-src/rundump.c
+++ b/client-src/rundump.c
@@ -138,9 +138,10 @@ main(
 
 #ifdef XFSDUMP
 
-    if (g_str_equal(argv[0], "xfsdump"))
+    if (g_str_equal(argv[0], "xfsdump")) {
         dump_program = XFSDUMP;
-    else /* strcmp(argv[0], "xfsdump") != 0 */
+        validate_xfsdump_options(argc, argv);
+    } else /* strcmp(argv[0], "xfsdump") != 0 */
 
 #endif
 
@@ -160,6 +161,7 @@ main(
 
 #endif
 
+      {
 #if defined(DUMP)
         dump_program = DUMP;
         validate_dump_option(argc, argv);
@@ -176,6 +178,7 @@ main(
 #  endif
 # endif
 #endif
+      }
 
 
     /*
-- 
2.30.2

