From 5ff7190f0676157c9096511bbcd3d490d5da5758 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 17 Oct 2024 15:18:30 -0700
Subject: [PATCH] Do proper quoting for XFS commands

---
 quota/linux-lib.pl | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/quota/linux-lib.pl b/quota/linux-lib.pl
index e3690fb38..521d46b49 100755
--- a/quota/linux-lib.pl
+++ b/quota/linux-lib.pl
@@ -411,7 +411,8 @@ sub user_filesystems
 my ($user) = @_;
 my $n = 0;
 if (&has_command("xfs_quota")) {
-	$n = &parse_xfs_quota_output("xfs_quota -xc 'quota -b -i -u \'$user\''");
+	$n = &parse_xfs_quota_output(
+		"xfs_quota -xc ".quotemeta("quota -b -i -u $user"));
 	}
 return &parse_quota_output($config{'user_quota_command'}." ".
 			   quotemeta($user), $n);
@@ -429,7 +430,8 @@ sub group_filesystems
 my ($group) = @_;
 my $n = 0;
 if (&has_command("xfs_quota")) {
-	$n = &parse_xfs_quota_output("xfs_quota -xc 'quota -b -i -g \'$group\''");
+	$n = &parse_xfs_quota_output(
+		"xfs_quota -xc ".quotemeta("quota -b -i -g $group"));
 	}
 return &parse_quota_output($config{'group_quota_command'}." ".
 			   quotemeta($group), $n);
@@ -1010,9 +1012,10 @@ Set XFS quotas for some user and FS
 sub set_user_quota
 {
 my ($user, $fs, $sblocks, $hblocks, $sfiles, $hfiles) = @_;
-my $out = &backquote_logged("xfs_quota -x -c 'limit -u bsoft=${sblocks}k ".
-			    "bhard=${hblocks}k isoft=$sfiles ihard=$hfiles ".
-			    "\'$user\'' $fs 2>&1");
+my $out = &backquote_logged(
+	"xfs_quota -x -c ".
+	quotemeta("limit -u bsoft=${sblocks}k bhard=${hblocks}k ".
+		  "isoft=$sfiles ihard=$hfiles $user $fs")." 2>&1");
 &error($out) if ($?);
 }
 
@@ -1029,9 +1032,10 @@ Set XFS quotas for some group and FS
 sub set_group_quota
 {
 my ($group, $fs, $sblocks, $hblocks, $sfiles, $hfiles) = @_;
-my $out = &backquote_logged("xfs_quota -x -c 'limit -g bsoft=${sblocks}k ".
-			    "bhard=${hblocks}k isoft=$sfiles ihard=$hfiles ".
-			    "\'$group\'' $fs 2>&1");
+my $out = &backquote_logged(
+	"xfs_quota -x -c ".
+	quotemeta("limit -g bsoft=${sblocks}k bhard=${hblocks}k "
+		  "isoft=$sfiles ihard=$hfiles $group $fs")." 2>&1");
 &error($out) if ($?);
 }