From: Matthew Daley <mattjd@gmail.com>
Date: Wed, 18 Sep 2013 03:37:57 +0000 (+1200)
Subject: mini-os: fix nodename generation in init_netfront
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6307
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e7da90205a08b9ab31f4ada97c2d5bab491c2ec;p=xen.git

mini-os: fix nodename generation in init_netfront

Using strlen here makes no sense.

Coverity-ID: 1056053
Signed-off-by: Matthew Daley <mattjd@gmail.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---

diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c
index 4e087a56ed..a999985575 100644
--- a/extras/mini-os/netfront.c
+++ b/extras/mini-os/netfront.c
@@ -309,8 +309,10 @@ struct netfront_dev *init_netfront(char *_nodename, void (*thenetif_rx)(unsigned
 
     if (!_nodename)
         snprintf(nodename, sizeof(nodename), "device/vif/%d", netfrontends);
-    else
-        strncpy(nodename, _nodename, strlen(nodename));
+    else {
+        strncpy(nodename, _nodename, sizeof(nodename) - 1);
+        nodename[sizeof(nodename) - 1] = 0;
+    }
     netfrontends++;
 
     if (!thenetif_rx)