package/pppd: fix pppd startup with upstream patches
v2 cover package/pppd: fix pppd startup with upstream patches
Hello,
pppd fails to start on a systems with buildroot 2024.02.x because of missing pppd directory in /var/run. There are some logs hinting at this issue:
Warning: couldn't open ppp database /var/run/pppd/pppd2.tdb
Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory
The issue has already been detected and fixed upstream (see [1]) and is expected to be released on a v2.5.1, but this release seems to be stalled for now (see [2]). A mere bump of the package is then not currently possible, so I am proposing a pick of the 3 relevant patches to fix this startup issue, both for master and 2024.02.x
Tested on ARM Cortex A9
Changes in v2:
- re-generated correctly patches to preserve original author
- added missing SoB
[1] https://github.com/ppp-project/ppp/issues/419
[2] https://github.com/ppp-project/ppp/issues/460
Alexis Lothoré (3):
package/pppd: revert lock path
package/pppd: add mkdir recursive
package/pppd: create rundir when it is missing
...005-Revert-lock-path-to-var-lock-435.patch | 66 ++++ .../pppd/0006-utils-add-mkdir_recursive.patch | 294 ++++++++++++++++++ ...0007-try-to-create-rundir-if-missing.patch | 52 ++++ 3 files changed, 412 insertions(+) create mode 100644 package/pppd/0005-Revert-lock-path-to-var-lock-435.patch create mode 100644 package/pppd/0006-utils-add-mkdir_recursive.patch create mode 100644 package/pppd/0007-try-to-create-rundir-if-missing.patch
Signature · 6 lines
2.44.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/3 package/pppd: revert lock path
pppd fails to start on buildroot 2024.02, because of non-existing directory pppd in /var/run
--- ...005-Revert-lock-path-to-var-lock-435.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/pppd/0005-Revert-lock-path-to-var-lock-435.patch
package/pppd/0005-Revert-lock-path-to-var-lock-435.patch new file +66 -0
@@ -0,0 +1,66 @@ +From 50aec48624b76d9ebb8b49309c3bfd3463745a26 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet <[email protected]> +Date: Tue, 10 Oct 2023 10:05:50 +0900 +Subject: [PATCH] Revert lock path to /var/lock (#435) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +lock dir changed on linux from /var/lock to /run/pppd/lock with +pppd-2.5.0, which makes pppd fail to start if the distribution does not +pre-create the directory. + +This reverts it back to /var/lock. + +The paths for other OS should be identical as LOCALSTATEDIR should be +/var, but also revert them back as well just in case. +Since the variable is no longer used remove it from makefiles. + +Fixes: 66a8c74c3f73 ("Let ./configure control the paths for pppd") +Fixes: #419 + +Signed-off-by: Dominique Martinet <[email protected]> +Co-authored-by: Dominique Martinet <[email protected]> +Upstream: https://github.com/ppp-project/ppp/commit/99cbf5e269994482edaf64624be8b1c806f9587c +Signed-off-by: Alexis Lothoré <[email protected]> +--- + pppd/Makefile.am | 2 +- + pppd/pathnames.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pppd/Makefile.am b/pppd/Makefile.am +index e5bedf26af96..7cb30053322e 100644 +--- a/pppd/Makefile.am ++++ b/pppd/Makefile.am +@@ -83,7 +83,7 @@ pppd_SOURCES = \ + upap.c \ + utils.c + +-pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"' ++pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"' + pppd_LDFLAGS = + pppd_LIBS = + +diff --git a/pppd/pathnames.h b/pppd/pathnames.h +index de2fb6889005..12609a969429 100644 +--- a/pppd/pathnames.h ++++ b/pppd/pathnames.h +@@ -120,12 +120,12 @@ + #define PPP_PATH_PPPDB PPP_PATH_VARRUN "/pppd2.tdb" + + #ifdef __linux__ +-#define PPP_PATH_LOCKDIR PPP_PATH_VARRUN "/lock" ++#define PPP_PATH_LOCKDIR "/var/lock" + #else + #ifdef SVR4 +-#define PPP_PATH_LOCKDIR LOCALSTATEDIR "/spool/locks" ++#define PPP_PATH_LOCKDIR "/var/spool/locks" + #else +-#define PPP_PATH_LOCKDIR LOCALSTATEDIR "/spool/lock" ++#define PPP_PATH_LOCKDIR "/var/spool/lock" + #endif + #endif + +-- +2.44.0 +
Signature · 6 lines
2.44.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/3 package/pppd: add mkdir recursive
In reply to Alexis Lothoré via buildrootpppd fails to start on buildroot 2024.02, because of non-existing directory pppd in /var/run
--- .../pppd/0006-utils-add-mkdir_recursive.patch | 294 ++++++++++++++++++ 1 file changed, 294 insertions(+) create mode 100644 package/pppd/0006-utils-add-mkdir_recursive.patch
package/pppd/0006-utils-add-mkdir_recursive.patch new file +294 -0
@@ -0,0 +1,294 @@ +From 2c1e12a7ebacc9b18b7c34f55bf01b75b292c2d9 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet <[email protected]> +Date: Wed, 30 Aug 2023 11:46:01 +0900 +Subject: [PATCH] utils: add mkdir_recursive +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will be used in the next commit. + +A test file for utils has also been added to check mkdir works as +intended. + +Signed-off-by: Dominique Martinet <[email protected]> +Upstream: https://github.com/ppp-project/ppp/commit/b0e7307b3569a5dad0f2606d2736cc8317851598 +Signed-off-by: Alexis Lothoré <[email protected]> +--- + pppd/Makefile.am | 6 ++ + pppd/pppd-private.h | 1 + + pppd/utils.c | 82 ++++++++++++++++++++++++++ + pppd/utils_utest.c | 139 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 228 insertions(+) + create mode 100644 pppd/utils_utest.c + +diff --git a/pppd/Makefile.am b/pppd/Makefile.am +index 7cb30053322e..c5fe10776ede 100644 +--- a/pppd/Makefile.am ++++ b/pppd/Makefile.am +@@ -20,6 +20,12 @@ utest_pppcrypt_LDFLAGS = + + check_PROGRAMS += utest_crypto + ++utest_utils_SOURCES = utils.c utils_utest.c ++utest_utils_CPPFLAGS = -DUNIT_TEST ++utest_utils_LDFLAGS = ++ ++check_PROGRAMS += utest_utils ++ + if WITH_SRP + sbin_PROGRAMS += srp-entry + dist_man8_MANS += srp-entry.8 +diff --git a/pppd/pppd-private.h b/pppd/pppd-private.h +index 2883e4622acb..46ce0c8bdceb 100644 +--- a/pppd/pppd-private.h ++++ b/pppd/pppd-private.h +@@ -437,6 +437,7 @@ int sifproxyarp(int, u_int32_t); + int cifproxyarp(int, u_int32_t); + /* Delete proxy ARP entry for peer */ + u_int32_t GetMask(u_int32_t); /* Get appropriate netmask for address */ ++int mkdir_recursive(const char *); /* Recursively create directory */ + int lock(char *); /* Create lock file for device */ + int relock(int); /* Rewrite lock file with new pid */ + void unlock(void); /* Delete previously-created lock file */ +diff --git a/pppd/utils.c b/pppd/utils.c +index c1bdbbbfe4e5..c47192e67fef 100644 +--- a/pppd/utils.c ++++ b/pppd/utils.c +@@ -781,6 +781,88 @@ complete_read(int fd, void *buf, size_t count) + } + #endif + ++/* ++ * mkdir_check - helper for mkdir_recursive, creates a directory ++ * but do not error on EEXIST if and only if entry is a directory ++ * The caller must check for errno == ENOENT if appropriate. ++ */ ++static int ++mkdir_check(const char *path) ++{ ++ struct stat statbuf; ++ ++ if (mkdir(path, 0755) >= 0) ++ return 0; ++ ++ if (errno == EEXIST) { ++ if (stat(path, &statbuf) < 0) ++ /* got raced? */ ++ return -1; ++ ++ if ((statbuf.st_mode & S_IFMT) == S_IFDIR) ++ return 0; ++ ++ /* already exists but not a dir, treat as failure */ ++ errno = EEXIST; ++ return -1; ++ } ++ ++ return -1; ++} ++ ++/* ++ * mkdir_parent - helper for mkdir_recursive, modifies the string in place ++ * Assumes mkdir(path) already failed, so it first creates the parent then ++ * full path again. ++ */ ++static int ++mkdir_parent(char *path) ++{ ++ char *slash; ++ int rc; ++ ++ slash = strrchr(path, '/'); ++ if (!slash) ++ return -1; ++ ++ *slash = 0; ++ if (mkdir_check(path) < 0) { ++ if (errno != ENOENT) { ++ *slash = '/'; ++ return -1; ++ } ++ if (mkdir_parent(path) < 0) { ++ *slash = '/'; ++ return -1; ++ } ++ } ++ *slash = '/'; ++ ++ return mkdir_check(path); ++} ++ ++/* ++ * mkdir_recursive - recursively create directory if it didn't exist ++ */ ++int ++mkdir_recursive(const char *path) ++{ ++ char *copy; ++ int rc; ++ ++ // optimistically try on full path first to avoid allocation ++ if (mkdir_check(path) == 0) ++ return 0; ++ ++ copy = strdup(path); ++ if (!copy) ++ return -1; ++ ++ rc = mkdir_parent(copy); ++ free(copy); ++ return rc; ++} ++ + /* Procedures for locking the serial device using a lock file. */ + static char lock_file[MAXPATHLEN]; + +diff --git a/pppd/utils_utest.c b/pppd/utils_utest.c +new file mode 100644 +index 000000000000..cdca97e6d025 +--- /dev/null ++++ b/pppd/utils_utest.c +@@ -0,0 +1,139 @@ ++#include <fcntl.h> ++#include <string.h> ++#include <sys/stat.h> ++#include <unistd.h> ++ ++#include "pppd-private.h" ++ ++/* globals used in test.c... */ ++int debug = 1; ++int error_count; ++int unsuccess; ++ ++/* check if path exists and returns its type */ ++static int ++file_type(char *path) ++{ ++ struct stat statbuf; ++ ++ if (stat(path, &statbuf) < 0) ++ return -1; ++ ++ return statbuf.st_mode & S_IFMT; ++} ++ ++int ++test_simple() { ++ if (mkdir_recursive("dir")) ++ return -1; ++ ++ if (file_type("dir") != S_IFDIR) ++ return -1; ++ ++ rmdir("dir"); ++ return 0; ++} ++ ++int ++test_recurse() { ++ if (mkdir_recursive("dir/subdir/subsubdir")) ++ return -1; ++ ++ if (file_type("dir/subdir/subsubdir") != S_IFDIR) ++ return -1; ++ ++ rmdir("dir/subdir/subsubdir"); ++ ++ /* try again with partial existence */ ++ if (mkdir_recursive("dir/subdir/subsubdir")) ++ return -1; ++ ++ if (file_type("dir/subdir/subsubdir") != S_IFDIR) ++ return -1; ++ ++ rmdir("dir/subdir/subsubdir"); ++ rmdir("dir/subdir"); ++ rmdir("dir"); ++ return 0; ++} ++ ++int ++test_recurse_multislash() { ++ if (mkdir_recursive("dir/subdir///subsubdir")) ++ return -1; ++ ++ if (file_type("dir/subdir/subsubdir") != S_IFDIR) ++ return -1; ++ ++ rmdir("dir/subdir/subsubdir"); ++ rmdir("dir/subdir"); ++ ++ /* try again with partial existence */ ++ if (mkdir_recursive("dir/subdir/subsubdir///")) ++ return -1; ++ ++ if (file_type("dir/subdir/subsubdir") != S_IFDIR) ++ return -1; ++ ++ rmdir("dir/subdir/subsubdir"); ++ rmdir("dir/subdir"); ++ rmdir("dir"); ++ return 0; ++} ++ ++int ++test_parent_notdir() { ++ int fd = open("file", O_CREAT, 0600); ++ if (fd < 0) ++ return -1; ++ close(fd); ++ ++ if (mkdir_recursive("file") == 0) ++ return -1; ++ if (mkdir_recursive("file/dir") == 0) ++ return -1; ++ ++ unlink("file"); ++ return 0; ++} ++ ++int ++main() ++{ ++ char *base_dir = strdup("/tmp/ppp_utils_utest.XXXXXX"); ++ int failure = 0; ++ ++ if (mkdtemp(base_dir) == NULL) { ++ printf("Could not create test directory, aborting\n"); ++ return 1; ++ } ++ ++ if (chdir(base_dir) < 0) { ++ printf("Could not enter newly created test dir, aborting\n"); ++ return 1; ++ } ++ ++ if (test_simple()) { ++ printf("Could not create simple directory\n"); ++ failure++; ++ } ++ ++ if (test_recurse()) { ++ printf("Could not create recursive directory\n"); ++ failure++; ++ } ++ ++ if (test_recurse_multislash()) { ++ printf("Could not create recursive directory with multiple slashes\n"); ++ failure++; ++ } ++ ++ if (test_parent_notdir()) { ++ printf("Creating over a file appeared to work?\n"); ++ failure++; ++ } ++ ++ rmdir(base_dir); ++ free(base_dir); ++ return failure; ++} +-- +2.44.0 +
Signature · 6 lines
2.44.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/3 package/pppd: create rundir when it is missing
In reply to Alexis Lothoré via buildrootpppd fails to start on buildroot 2024.02, because of non-existing directory pppd in /var/run
--- ...0007-try-to-create-rundir-if-missing.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/pppd/0007-try-to-create-rundir-if-missing.patch
package/pppd/0007-try-to-create-rundir-if-missing.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 8ef2b1d5e13540cfb365490ea1ed131784184c1a Mon Sep 17 00:00:00 2001 +From: Dominique Martinet <[email protected]> +Date: Thu, 3 Aug 2023 16:37:27 +0900 +Subject: [PATCH] try to create rundir if missing +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Runtime dir changed from /run to /run/pppd in commit 66a8c74c3f73 ("Let +./configure control the paths for pppd") and is likely to not exist on +some distros, in which case the pppdb will not be created. + +See: #419 (lock directory moved in ppp-2.5.0) +Signed-off-by: Dominique Martinet <[email protected]> +Upstream: https://github.com/ppp-project/ppp/commit/3a4fec968174fd6f387d5ec872a56343f256f645 +Signed-off-by: Alexis Lothoré <[email protected]> +--- + pppd/tdb.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/pppd/tdb.c b/pppd/tdb.c +index 8a563f88b9a6..62644171aa6e 100644 +--- a/pppd/tdb.c ++++ b/pppd/tdb.c +@@ -60,8 +60,11 @@ + #include <sys/mman.h> + #include <sys/stat.h> + #include <signal.h> ++ ++#include "pppd-private.h" + #include "tdb.h" + #include "spinlock.h" ++#include "pathnames.h" + + #define TDB_MAGIC_FOOD "TDB file\n" + #define TDB_VERSION (0x26011967 + 6) +@@ -1728,7 +1731,12 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags, + goto internal; + } + ++again: + if ((tdb->fd = open(name, open_flags, mode)) == -1) { ++ if ((open_flags & O_CREAT) && errno == ENOENT && ++ mkdir_recursive(PPP_PATH_VARRUN) == 0) ++ goto again; ++ + TDB_LOG((tdb, 5, "tdb_open_ex: could not open file %s: %s\n", + name, strerror(errno))); + goto fail; /* errno set by open(2) */ +-- +2.44.0 +
Signature · 6 lines
2.44.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot