conf: kill PATH_MAX bytes

parent 48e5dcc8
...@@ -2128,14 +2128,13 @@ static inline int mount_entry_on_systemfs(struct lxc_rootfs *rootfs, ...@@ -2128,14 +2128,13 @@ static inline int mount_entry_on_systemfs(struct lxc_rootfs *rootfs,
} }
static int mount_entry_on_absolute_rootfs(struct mntent *mntent, static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
const struct lxc_rootfs *rootfs, struct lxc_rootfs *rootfs,
const char *lxc_name, const char *lxc_name,
const char *lxc_path) const char *lxc_path)
{ {
int offset; int offset;
char *aux; char *aux;
const char *lxcpath; const char *lxcpath;
char path[PATH_MAX];
int ret = 0; int ret = 0;
lxcpath = lxc_global_config_value("lxc.lxcpath"); lxcpath = lxc_global_config_value("lxc.lxcpath");
...@@ -2145,13 +2144,13 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent, ...@@ -2145,13 +2144,13 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
/* If rootfs->path is a blockdev path, allow container fstab to use /* If rootfs->path is a blockdev path, allow container fstab to use
* <lxcpath>/<name>/rootfs" as the target prefix. * <lxcpath>/<name>/rootfs" as the target prefix.
*/ */
ret = snprintf(path, PATH_MAX, "%s/%s/rootfs", lxcpath, lxc_name); ret = snprintf(rootfs->buf, sizeof(rootfs->buf), "%s/%s/rootfs", lxcpath, lxc_name);
if (ret < 0 || ret >= PATH_MAX) if (ret < 0 || ret >= sizeof(rootfs->buf))
goto skipvarlib; goto skipvarlib;
aux = strstr(mntent->mnt_dir, path); aux = strstr(mntent->mnt_dir, rootfs->buf);
if (aux) { if (aux) {
offset = strlen(path); offset = strlen(rootfs->buf);
goto skipabs; goto skipabs;
} }
...@@ -2162,11 +2161,11 @@ skipvarlib: ...@@ -2162,11 +2161,11 @@ skipvarlib:
offset = strlen(rootfs->path); offset = strlen(rootfs->path);
skipabs: skipabs:
ret = snprintf(path, PATH_MAX, "%s/%s", rootfs->mount, aux + offset); ret = snprintf(rootfs->buf, sizeof(rootfs->buf), "%s/%s", rootfs->mount, aux + offset);
if (ret < 0 || ret >= PATH_MAX) if (ret < 0 || ret >= sizeof(rootfs->buf))
return -1; return -1;
return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path); return mount_entry_on_generic(mntent, rootfs->buf, rootfs, lxc_name, lxc_path);
} }
static int mount_entry_on_relative_rootfs(struct mntent *mntent, static int mount_entry_on_relative_rootfs(struct mntent *mntent,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment