svn commit: r351703 - head/sys/compat/linux

Edward Tomasz Napierala trasz at FreeBSD.org
Mon Sep 2 16:57:43 UTC 2019


Author: trasz
Date: Mon Sep  2 16:57:42 2019
New Revision: 351703
URL: https://svnweb.freebsd.org/changeset/base/351703

Log:
  Relax compat.linux.osrelease checks.  This way one can do eg
  'compat.linux.osrelease=3.10.0-957.12.1.el7.x86_64', which
  corresponds to CentOS 7.
  
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D20685

Modified:
  head/sys/compat/linux/linux_mib.c

Modified: head/sys/compat/linux/linux_mib.c
==============================================================================
--- head/sys/compat/linux/linux_mib.c	Mon Sep  2 15:24:25 2019	(r351702)
+++ head/sys/compat/linux/linux_mib.c	Mon Sep  2 16:57:42 2019	(r351703)
@@ -146,7 +146,8 @@ linux_map_osrel(char *osrelease, int *osrel)
 		return (EINVAL);
 	osrelease = sep + 1;
 	v2 = strtol(osrelease, &sep, 10);
-	if (osrelease == sep || sep != eosrelease)
+	if (osrelease == sep ||
+	    (sep != eosrelease && (sep + 1 >= eosrelease || *sep != '-')))
 		return (EINVAL);
 
 	v = LINUX_KERNVER(v0, v1, v2);


More information about the svn-src-head mailing list