s/apparmor: trim whitespace from permstable32_version before parsing

Signed-off-by: Oliver Calder <[email protected]>
canonical · Sep 10, 2024 · 5e27752 · 5e27752
1 parent 094a2c7
commit 5e27752
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sandbox/apparmor/apparmor.go b/sandbox/apparmor/apparmor.go
@@ -704,7 +704,7 @@ func probeKernelFeaturesPermstable32Version() (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	return strconv.ParseInt(string(data), 0, 64)
+	return strconv.ParseInt(strings.TrimSpace(string(data)), 0, 64)
 }
 
 func probeParserFeatures() ([]string, error) {

diff --git a/sandbox/apparmor/apparmor_test.go b/sandbox/apparmor/apparmor_test.go
@@ -375,15 +375,15 @@ func (s *apparmorSuite) TestProbeAppArmorKernelFeaturesPermstable32Version(c *C)
 		ver int64
 	}{
 		{
-			"0x000001",
+			"0x000001\n",
 			1,
 		},
 		{
 			"0x2",
 			2,
 		},
 		{
-			"0x0000000000000003",
+			"0x0000000000000003\n",
 			3,
 		},
 		{