Merge pull request #1630 from brauner/2017-06-20/fix_siblk_detection

utils: use 1LU otherwise we overflow

Merge pull request #1630 from brauner/2017-06-20/fix_siblk_detection
842404a7 · Serge Hallyn · GitHub · 71e4d99c · 6fbcbe3b · 842404a7
Commit 842404a7 authored Jun 19, 2017 by Serge Hallyn Committed by GitHub Jun 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

utils.c src/lxc/utils.c +6 -4

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1923,12 +1923,14 @@ bool task_blocking_signal(pid_t pid, int signal)
 		return bret;

 	while (getline(&line, &n, f) != -1) {
-		if (!strncmp(line, "SigBlk:\t", 8))
-			if (sscanf(line + 8, "%lx", &sigblk) != 1)
-				goto out;
+		if (strncmp(line, "SigBlk:\t", 8))
+			continue;
+
+		if (sscanf(line + 8, "%lx", &sigblk) != 1)
+			goto out;
 	}

-	if (sigblk & (1 << (signal - 1)))
+	if (sigblk & (1LU << (signal - 1)))
 		bret = true;

 out: