From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 14 May 2012 23:42:10 +0000 (+0000)
Subject: Fix kernel release string parsing
X-Git-Tag: v4.8~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dbc80de895c25769791b7726022a274695eec31;p=strace

Fix kernel release string parsing

* strace.c (get_os_release): Handle "X.Y-something" utsname.release
strings properly.

Reported-by: Bryce Gibson <bryce@gibson-consulting.com.au>
---

diff --git a/strace.c b/strace.c
index 857136d5..65dee7d5 100644
--- a/strace.c
+++ b/strace.c
@@ -1432,8 +1432,14 @@ get_os_release(void)
 			break;
 		while (*p >= '0' && *p <= '9')
 			p++;
-		if (*p != '.')
+		if (*p != '.') {
+			if (rel >= KERNEL_VERSION(0,1,0)) {
+				/* "X.Y-something" means "X.Y.0" */
+				rel <<= 8;
+				break;
+			}
 			error_msg_and_die("Bad OS release string: '%s'", u.release);
+		}
 		p++;
 	}
 	return rel;