[lxc-devel] [lxc/master] trivial fix: unprivileged veth devices (e.g. vethFWABHX) never contain 'Z' char

[hn on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 482 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190107/863152b2/attachment.bin>
-------------- next part --------------
From fdf681c44f212e5102bcc5c3713cc027f99e837c Mon Sep 17 00:00:00 2001
From: hn <hn at users.noreply.github.com>
Date: Mon, 7 Jan 2019 19:42:02 +0100
Subject: [PATCH] fix: unprivileged veth devices (e.g. vethFWABHX) never
 contain 'Z' character in the randomly generated device name part because for
 modulo one does not need to substract 1 from strlen().

---
 src/lxc/network.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lxc/network.c b/src/lxc/network.c
index d0f14e6323..499ddff6e8 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -1982,9 +1982,9 @@ char *lxc_mkifname(char *template)
 		for (i = 0; i < strlen(name); i++) {
 			if (name[i] == 'X') {
 #ifdef HAVE_RAND_R
-				name[i] = padchar[rand_r(&seed) % (strlen(padchar) - 1)];
+				name[i] = padchar[rand_r(&seed) % strlen(padchar)];
 #else
-				name[i] = padchar[rand() % (strlen(padchar) - 1)];
+				name[i] = padchar[rand() % strlen(padchar)];
 #endif
 			}
 		}