|
 |
96dc52 |
autofs-5.1.7 - use mount_fullpath() in one spot in parse_mount()
|
|
|
96dc52 |
|
|
|
96dc52 |
From: Ian Kent <raven@themaw.net>
|
|
|
96dc52 |
|
|
|
96dc52 |
mount_fullpath() is meant to be used for this type of path construction
|
|
|
96dc52 |
so use it.
|
|
|
96dc52 |
|
|
|
96dc52 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
96dc52 |
---
|
|
|
96dc52 |
CHANGELOG | 1 +
|
|
|
96dc52 |
modules/parse_sun.c | 34 ++++++++--------------------------
|
|
|
96dc52 |
2 files changed, 9 insertions(+), 26 deletions(-)
|
|
|
96dc52 |
|
|
|
96dc52 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
96dc52 |
index 444ade5b..8494f0dc 100644
|
|
|
96dc52 |
--- a/CHANGELOG
|
|
|
96dc52 |
+++ b/CHANGELOG
|
|
|
96dc52 |
@@ -43,6 +43,7 @@
|
|
|
96dc52 |
- switch to use tree implementation for offsets.
|
|
|
96dc52 |
- remove obsolete functions.
|
|
|
96dc52 |
- remove redundant local var from sun_mount().
|
|
|
96dc52 |
+- use mount_fullpath() in one spot in parse_mount().
|
|
|
96dc52 |
|
|
|
96dc52 |
25/01/2021 autofs-5.1.7
|
|
|
96dc52 |
- make bind mounts propagation slave by default.
|
|
|
96dc52 |
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
|
|
|
96dc52 |
index 437869b5..d3fc6c7f 100644
|
|
|
96dc52 |
--- a/modules/parse_sun.c
|
|
|
96dc52 |
+++ b/modules/parse_sun.c
|
|
|
96dc52 |
@@ -1354,36 +1354,18 @@ dont_expand:
|
|
|
96dc52 |
debug(ap->logopt, MODPREFIX "gathered options: %s", options);
|
|
|
96dc52 |
|
|
|
96dc52 |
if (check_is_multi(p)) {
|
|
|
96dc52 |
- char *m_root = NULL;
|
|
|
96dc52 |
+ char m_root[PATH_MAX + 1];
|
|
|
96dc52 |
int m_root_len;
|
|
|
96dc52 |
time_t age;
|
|
|
96dc52 |
int l;
|
|
|
96dc52 |
|
|
|
96dc52 |
- /* If name starts with "/" it's a direct mount */
|
|
|
96dc52 |
- if (*name == '/') {
|
|
|
96dc52 |
- m_root_len = name_len;
|
|
|
96dc52 |
- m_root = alloca(m_root_len + 1);
|
|
|
96dc52 |
- if (!m_root) {
|
|
|
96dc52 |
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
|
|
|
96dc52 |
- free(options);
|
|
|
96dc52 |
- free(pmapent);
|
|
|
96dc52 |
- logerr(MODPREFIX "alloca: %s", estr);
|
|
|
96dc52 |
- return 1;
|
|
|
96dc52 |
- }
|
|
|
96dc52 |
- strcpy(m_root, name);
|
|
|
96dc52 |
- } else {
|
|
|
96dc52 |
- m_root_len = ap->len + name_len + 1;
|
|
|
96dc52 |
- m_root = alloca(m_root_len + 1);
|
|
|
96dc52 |
- if (!m_root) {
|
|
|
96dc52 |
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
|
|
|
96dc52 |
- free(options);
|
|
|
96dc52 |
- free(pmapent);
|
|
|
96dc52 |
- logerr(MODPREFIX "alloca: %s", estr);
|
|
|
96dc52 |
- return 1;
|
|
|
96dc52 |
- }
|
|
|
96dc52 |
- strcpy(m_root, ap->path);
|
|
|
96dc52 |
- strcat(m_root, "/");
|
|
|
96dc52 |
- strcat(m_root, name);
|
|
|
96dc52 |
+ m_root_len = mount_fullpath(m_root, PATH_MAX, ap->path, name);
|
|
|
96dc52 |
+ if (!m_root_len) {
|
|
|
96dc52 |
+ error(ap->logopt,
|
|
|
96dc52 |
+ MODPREFIX "multi-mount root path too long");
|
|
|
96dc52 |
+ free(options);
|
|
|
96dc52 |
+ free(pmapent);
|
|
|
96dc52 |
+ return 1;
|
|
|
96dc52 |
}
|
|
|
96dc52 |
|
|
|
96dc52 |
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
|