From 0c9b1f826d3bb1d3a927b2b6f4d580cd7ff28852 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 1 Sep 2018 00:53:33 +0200
Subject: [PATCH] macro: calculate buffer lengths correctly

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 src/lxc/macro.h | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 96d737267..8c8c91a6e 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -155,13 +155,30 @@
  *                +
  * \0           =    1
  */
-#define LXC_PROC_PID_FD_LEN (6 + INTTYPE_TO_STRLEN(pid_t) + 4 + INTTYPE_TO_STRLEN(int) + 1)
+#define LXC_PROC_PID_FD_LEN \
+	(6 + INTTYPE_TO_STRLEN(pid_t) + 4 + INTTYPE_TO_STRLEN(int) + 1)
 
-/* /proc/pid-to-str/status\0 = (5 + INTTYPE_TO_STRLEN(pid_t) + 7 + 1) */
-#define LXC_PROC_STATUS_LEN (5 + INTTYPE_TO_STRLEN(pid_t) + 7 + 1)
+/* /proc/        = 6
+ *               +
+ * <pid-as-str>  = INTTYPE_TO_STRLEN(pid_t)
+ *               +
+ * /status       = 7
+ *               +
+ * \0            = 1
+ */
+#define LXC_PROC_STATUS_LEN (6 + INTTYPE_TO_STRLEN(pid_t) + 7 + 1)
 
-/* /proc/pid-to-str/attr/current = (5 + INTTYPE_TO_STRLEN(pid_t) + 7 + 1) */
-#define LXC_LSMATTRLEN (5 + INTTYPE_TO_STRLEN(pid_t) + 7 + 1)
+/* /proc/        = 6
+ *               +
+ * <pid-as-str>  = INTTYPE_TO_STRLEN(pid_t)
+ *               +
+ * /attr/        = 6
+ *               +
+ * /current      = 8
+ *               +
+ * \0            = 1
+ */
+#define LXC_LSMATTRLEN (6 + INTTYPE_TO_STRLEN(pid_t) + 6 + 8 + 1)
 
 #define LXC_CMD_DATA_MAX (MAXPATHLEN * 2)