[lxc-devel] [lxd/master] gpu: fix Nvidia minor index parsing

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 381 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180626/50091e29/attachment.bin>
-------------- next part --------------
From a33e14c0f30847a261f61145a73abf678b8e0587 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 27 Jun 2018 00:53:50 +0200
Subject: [PATCH] gpu: fix Nvidia minor index parsing

Closes #4683.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 lxd/devices.go | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/lxd/devices.go b/lxd/devices.go
index 63a088121..ed573980d 100644
--- a/lxd/devices.go
+++ b/lxd/devices.go
@@ -147,19 +147,10 @@ func findNvidiaMinor(pci string) (string, error) {
 		idx += len("Device Minor:")
 		strBuf = strBuf[idx:]
 		strBuf = strings.TrimSpace(strBuf)
-		idx = strings.Index(strBuf, " ")
-
-		if idx == -1 {
-			idx = strings.Index(strBuf, "\t")
-		}
-
-		if idx >= 1 {
-			minor := strBuf[:idx]
-
-			_, err = strconv.Atoi(minor)
-			if err == nil {
-				return minor, nil
-			}
+		parts := strings.SplitN(strBuf, "\n", 1)
+		_, err = strconv.Atoi(parts[0])
+		if err == nil {
+			return parts[0], nil
 		}
 	}