systemd: Replace use of %m in printf formats
PATCH v2 1/1 systemd: Replace use of %m in printf formats
The patch is applied optionally only to uclibc builds Also move the mkostemp replacement patch to uclibc only list
--- .../systemd/systemd/format-replace-m-uclibc.patch | 428 ++++++++++++++++++++ meta-oe/recipes-core/systemd/systemd_git.bb | 8 +- 2 files changed, 434 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +428 -0
@@ -0,0 +1,428 @@ +Patch from Henning. %m is a glibc only thing. For uclibc we need to do it +differently. So we use static strings instead of mallocing them and free'ing + +I dont know if upstream systemd have plans to make systemd work on non +glibc system libraries if not then this patch would not make sense for +upstream + +Signed-off-by: Khem Raj <[email protected]> + +Index: git/src/mount-setup.c +=================================================================== +--- git.orig/src/mount-setup.c 2011-06-03 23:30:05.985617093 +0200 ++++ git/src/mount-setup.c 2011-06-03 23:51:15.446677362 +0200 +@@ -146,10 +146,11 @@ + + for (;;) { + MountPoint p; +- char *controller, *where; ++ char controller[30]; ++ char *where; + int enabled = false; + +- if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) { ++ if (fscanf(f, "%29s %*i %*i %i", controller, &enabled) != 2) { + + if (feof(f)) + break; +@@ -160,12 +161,10 @@ + } + + if (!enabled) { +- free(controller); + continue; + } + + if (asprintf(&where, "/sys/fs/cgroup/%s", controller) < 0) { +- free(controller); + r = -ENOMEM; + goto finish; + } +@@ -179,7 +178,6 @@ + p.fatal = false; + + r = mount_one(&p); +- free(controller); + free(where); + + if (r < 0) +Index: git/src/socket-util.c +=================================================================== +--- git.orig/src/socket-util.c 2011-06-03 23:30:05.988952093 +0200 ++++ git/src/socket-util.c 2011-06-03 23:31:55.056790399 +0200 +@@ -192,7 +192,7 @@ + int socket_address_parse_netlink(SocketAddress *a, const char *s) { + int family; + unsigned group = 0; +- char* sfamily = NULL; ++ char sfamily[50]; + assert(a); + assert(s); + +@@ -200,17 +200,14 @@ + a->type = SOCK_RAW; + + errno = 0; +- if (sscanf(s, "%ms %u", &sfamily, &group) < 1) ++ if (sscanf(s, "%49s %u", &sfamily, &group) < 1) + return errno ? -errno : -EINVAL; + + if ((family = netlink_family_from_string(sfamily)) < 0) + if (safe_atoi(sfamily, &family) < 0) { +- free(sfamily); + return -EINVAL; + } + +- free(sfamily); +- + a->sockaddr.nl.nl_family = AF_NETLINK; + a->sockaddr.nl.nl_groups = group; + +Index: git/src/cryptsetup-generator.c +=================================================================== +--- git.orig/src/cryptsetup-generator.c 2011-06-03 23:30:05.995622093 +0200 ++++ git/src/cryptsetup-generator.c 2011-06-03 23:31:55.056790399 +0200 +@@ -260,7 +260,7 @@ + + for (;;) { + char line[LINE_MAX], *l; +- char *name = NULL, *device = NULL, *password = NULL, *options = NULL; ++ char name[50], device[50], password[50], options[50] = NULL; + int k; + + if (!(fgets(line, sizeof(line), f))) +@@ -272,7 +272,7 @@ + if (*l == '#' || *l == 0) + continue; + +- if ((k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options)) < 2 || k > 4) { ++ if ((k = sscanf(l, "%s %s %s %s", &name, &device, &password, &options)) < 2 || k > 4) { + log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); + r = EXIT_FAILURE; + goto next; +@@ -281,11 +281,7 @@ + if (create_disk(name, device, password, options) < 0) + r = EXIT_FAILURE; + +- next: +- free(name); +- free(device); +- free(password); +- free(options); ++ next:; + } + + finish: +Index: git/src/ask-password-api.c +=================================================================== +--- git.orig/src/ask-password-api.c 2011-06-03 23:30:06.002292093 +0200 ++++ git/src/ask-password-api.c 2011-06-03 23:31:55.056790399 +0200 +@@ -319,7 +319,7 @@ + + mkdir_p("/run/systemd/ask-password", 0755); + +- if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) { ++ if ((fd = mkstemp(temp)) < 0) { + log_error("Failed to create password file: %m"); + r = -errno; + goto finish; +Index: git/src/manager.c +=================================================================== +--- git.orig/src/manager.c 2011-06-03 23:30:06.008962093 +0200 ++++ git/src/manager.c 2011-06-03 23:31:55.060125399 +0200 +@@ -2623,7 +2623,7 @@ + return -ENOMEM; + + saved_umask = umask(0077); +- fd = mkostemp(path, O_RDWR|O_CLOEXEC); ++ fd = mkstemp(path); + umask(saved_umask); + + if (fd < 0) { +Index: git/src/swap.c +=================================================================== +--- git.orig/src/swap.c 2011-06-03 23:30:06.015632093 +0200 ++++ git/src/swap.c 2011-06-03 23:31:55.060125399 +0200 +@@ -1043,11 +1043,12 @@ + (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n"); + + for (i = 1;; i++) { +- char *dev = NULL, *d; ++ char *d; ++ char dev[20]; + int prio = 0, k; + + if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ +@@ -1058,12 +1059,10 @@ + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); +- free(dev); + continue; + } + + d = cunescape(dev); +- free(dev); + + if (!d) + return -ENOMEM; +Index: git/src/tmpfiles.c +=================================================================== +--- git.orig/src/tmpfiles.c 2011-06-03 23:30:06.022302093 +0200 ++++ git/src/tmpfiles.c 2011-06-03 23:50:17.207573272 +0200 +@@ -66,7 +66,7 @@ + typedef struct Item { + char type; + +- char *path; ++ char path[50]; + uid_t uid; + gid_t gid; + mode_t mode; +@@ -619,7 +619,6 @@ + static void item_free(Item *i) { + assert(i); + +- free(i->path); + free(i); + } + +@@ -654,7 +653,7 @@ + + static int parse_line(const char *fname, unsigned line, const char *buffer) { + Item *i, *existing; +- char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; ++ char mode[50], user[50], group[50], age[50]; + Hashmap *h; + int r; + +@@ -669,17 +668,17 @@ + + if (sscanf(buffer, + "%c " +- "%ms " +- "%ms " +- "%ms " +- "%ms " +- "%ms", ++ "%s " ++ "%s " ++ "%s " ++ "%s " ++ "%s", + &i->type, + &i->path, +- &mode, +- &user, +- &group, +- &age) < 2) { ++ mode, ++ user, ++ group, ++ age) < 2) { + log_error("[%s:%u] Syntax error.", fname, line); + r = -EIO; + goto finish; +@@ -793,11 +792,6 @@ + r = 0; + + finish: +- free(user); +- free(group); +- free(mode); +- free(age); +- + if (i) + item_free(i); + +Index: git/src/mount.c +=================================================================== +--- git.orig/src/mount.c 2011-06-03 23:30:06.028972093 +0200 ++++ git/src/mount.c 2011-06-03 23:42:54.769805160 +0200 +@@ -24,6 +24,7 @@ + #include <mntent.h> + #include <sys/epoll.h> + #include <signal.h> ++#include <string.h> + + #include "unit.h" + #include "mount.h" +@@ -1555,7 +1556,13 @@ + static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { + int r = 0; + unsigned i; +- char *device, *path, *options, *options2, *fstype, *d, *p, *o; ++ char *d, *p, *o; ++ char device[50]; ++ char path[50]; ++ char options[50]; ++ char options2[50]; ++ char fstype[50]; ++ + + assert(m); + +@@ -1564,26 +1571,26 @@ + for (i = 1;; i++) { + int k; + +- device = path = options = options2 = fstype = d = p = o = NULL; ++ d = p = o = NULL; + + if ((k = fscanf(m->proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ +- "%ms " /* (5) mount point */ +- "%ms" /* (6) mount options */ ++ "%49s " /* (5) mount point */ ++ "%49s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +- "%ms " /* (9) file system type */ +- "%ms" /* (10) mount source */ +- "%ms" /* (11) mount options 2 */ ++ "%49s " /* (9) file system type */ ++ "%49s" /* (10) mount source */ ++ "%49s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +- &path, +- &options, +- &fstype, +- &device, +- &options2)) != 5) { ++ path, ++ options, ++ fstype, ++ device, ++ options2)) != 5) { + + if (k == EOF) + break; +@@ -1607,22 +1614,12 @@ + r = k; + + clean_up: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); + } + + finish: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); +Index: git/src/umount.c +=================================================================== +--- git.orig/src/umount.c 2011-06-03 23:30:06.035642093 +0200 ++++ git/src/umount.c 2011-06-03 23:51:56.784001724 +0200 +@@ -60,7 +60,9 @@ + + static int mount_points_list_get(MountPoint **head) { + FILE *proc_self_mountinfo; +- char *path, *p; ++ char *p; ++ char path[50]; ++ + unsigned int i; + int r; + +@@ -72,17 +74,17 @@ + for (i = 1;; i++) { + int k; + MountPoint *m; +- char *root; ++ char root[50]; + bool skip_ro; + +- path = p = NULL; ++ p = NULL; + + if ((k = fscanf(proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ +- "%ms " /* (4) root */ +- "%ms " /* (5) mount point */ ++ "%49s " /* (4) root */ ++ "%49s " /* (5) mount point */ + "%*s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +@@ -90,24 +92,21 @@ + "%*s" /* (10) mount source */ + "%*s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +- &root, +- &path)) != 2) { ++ root, ++ path)) != 2) { + if (k == EOF) + break; + + log_warning("Failed to parse /proc/self/mountinfo:%u.", i); + +- free(path); + continue; + } + + /* If we encounter a bind mount, don't try to remount + * the source dir too early */ + skip_ro = !streq(root, "/"); +- free(root); + + p = cunescape(path); +- free(path); + + if (!p) { + r = -ENOMEM; +@@ -152,28 +151,28 @@ + + for (i = 2;; i++) { + MountPoint *swap; +- char *dev = NULL, *d; ++ char *d; ++ char dev[50]; ++ + int k; + + if ((k = fscanf(proc_swaps, +- "%ms " /* device/file */ ++ "%50s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ + "%*s\n", /* priority */ +- &dev)) != 1) { ++ dev)) != 1) { + + if (k == EOF) + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); + +- free(dev); + continue; + } + + if (endswith(dev, "(deleted)")) { +- free(dev); + continue; + } +
meta-oe/recipes-core/systemd/systemd_git.bb +6 -2
@@ -15,7 +15,7 @@ inherit gitpkgv PKGV = "v${GITPKGVTAG}" PV = "git" -PR = "r5" +PR = "r6" inherit autotools vala
@@ -23,9 +23,13 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ - file://paper-over-mkostemp.patch \ file://use-nonet-for-docbook.patch \ + ${UCLIBCPATCHES} \ " +UCLIBCPATCHES = "" +UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ + file://format-replace-m-uclibc.patch \ + " S = "${WORKDIR}/git"
Signature · 1 line
1.7.4.1
Am Samstag, den 02.07.2011, 17:47 -0700 schrieb Khem Raj:
Quoted 2 lines
The patch is applied optionally only to uclibc builds Also move the mkostemp replacement patch to uclibc only list
A separate patch for that is better in my opinion.
Quoted 23 lines
Signed-off-by Khem Raj <[email protected]>--- .../systemd/systemd/format-replace-m-uclibc.patch | 428 ++++++++++++++++++++ meta-oe/recipes-core/systemd/systemd_git.bb | 8 +- 2 files changed, 434 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patchmeta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0@@ -0,0 +1,428 @@ +Patch from Henning. %m is a glibc only thing. For uclibc we need to do it +differently. So we use static strings instead of mallocing them and free'ing + +I dont know if upstream systemd have plans to make systemd work on non +glibc system libraries if not then this patch would not make sense for +upstream + +Signed-off-by: Khem Raj <[email protected]> + +Index: git/src/mount-setup.c
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 20
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+=================================================================== +--- git.orig/src/mount-setup.c 2011-06-03 23:30:05.985617093 +0200 ++++ git/src/mount-setup.c 2011-06-03 23:51:15.446677362 +0200 +@@ -146,10 +146,11 @@ + + for (;;) { + MountPoint p; +- char *controller, *where; ++ char controller[30]; ++ char *where;
White space looks different.
Quoted 95 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +95
-0+ int enabled = false; + +- if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) { ++ if (fscanf(f, "%29s %*i %*i %i", controller, &enabled) != 2) { + + if (feof(f)) + break; +@@ -160,12 +161,10 @@ + } + + if (!enabled) { +- free(controller); + continue; + } + + if (asprintf(&where, "/sys/fs/cgroup/%s", controller) < 0) { +- free(controller); + r = -ENOMEM; + goto finish; + } +@@ -179,7 +178,6 @@ + p.fatal = false; + + r = mount_one(&p); +- free(controller); + free(where); + + if (r < 0) +Index: git/src/socket-util.c +=================================================================== +--- git.orig/src/socket-util.c 2011-06-03 23:30:05.988952093 +0200 ++++ git/src/socket-util.c 2011-06-03 23:31:55.056790399 +0200 +@@ -192,7 +192,7 @@ + int socket_address_parse_netlink(SocketAddress *a, const char *s) { + int family; + unsigned group = 0; +- char* sfamily = NULL; ++ char sfamily[50]; + assert(a); + assert(s); + +@@ -200,17 +200,14 @@ + a->type = SOCK_RAW; + + errno = 0; +- if (sscanf(s, "%ms %u", &sfamily, &group) < 1) ++ if (sscanf(s, "%49s %u", &sfamily, &group) < 1) + return errno ? -errno : -EINVAL; + + if ((family = netlink_family_from_string(sfamily)) < 0) + if (safe_atoi(sfamily, &family) < 0) { +- free(sfamily); + return -EINVAL; + } + +- free(sfamily); +- + a->sockaddr.nl.nl_family = AF_NETLINK; + a->sockaddr.nl.nl_groups = group; + +Index: git/src/cryptsetup-generator.c +=================================================================== +--- git.orig/src/cryptsetup-generator.c 2011-06-03 23:30:05.995622093 +0200 ++++ git/src/cryptsetup-generator.c 2011-06-03 23:31:55.056790399 +0200 +@@ -260,7 +260,7 @@ + + for (;;) { + char line[LINE_MAX], *l; +- char *name = NULL, *device = NULL, *password = NULL, *options = NULL; ++ char name[50], device[50], password[50], options[50] = NULL; + int k; + + if (!(fgets(line, sizeof(line), f))) +@@ -272,7 +272,7 @@ + if (*l == '#' || *l == 0) + continue; + +- if ((k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options)) < 2 || k > 4) { ++ if ((k = sscanf(l, "%s %s %s %s", &name, &device, &password, &options)) < 2 || k > 4) { + log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); + r = EXIT_FAILURE; + goto next; +@@ -281,11 +281,7 @@ + if (create_disk(name, device, password, options) < 0) + r = EXIT_FAILURE; + +- next: +- free(name); +- free(device); +- free(password); +- free(options); ++ next:; + } + + finish:
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 125
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+Index: git/src/ask-password-api.c +=================================================================== +--- git.orig/src/ask-password-api.c 2011-06-03 23:30:06.002292093 +0200 ++++ git/src/ask-password-api.c 2011-06-03 23:31:55.056790399 +0200 +@@ -319,7 +319,7 @@ + + mkdir_p("/run/systemd/ask-password", 0755); + +- if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) { ++ if ((fd = mkstemp(temp)) < 0) {
Some of these changes seem to have slipped in too. Could you put those into the other patch or is there another reason for that?
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 138
Quoted 13 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +13
-0+ log_error("Failed to create password file: %m"); + r = -errno; + goto finish; +Index: git/src/manager.c +=================================================================== +--- git.orig/src/manager.c 2011-06-03 23:30:06.008962093 +0200 ++++ git/src/manager.c 2011-06-03 23:31:55.060125399 +0200 +@@ -2623,7 +2623,7 @@ + return -ENOMEM; + + saved_umask = umask(0077); +- fd = mkostemp(path, O_RDWR|O_CLOEXEC); ++ fd = mkstemp(path);
Dito.
Quoted 4 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +4
-0+ umask(saved_umask); + + if (fd < 0) { +Index: git/src/swap.c
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 152
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+=================================================================== +--- git.orig/src/swap.c 2011-06-03 23:30:06.015632093 +0200 ++++ git/src/swap.c 2011-06-03 23:31:55.060125399 +0200 +@@ -1043,11 +1043,12 @@ + (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n"); + + for (i = 1;; i++) { +- char *dev = NULL, *d; ++ char *d; ++ char dev[20];
White space.
Quoted 99 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +99
-0+ int prio = 0, k; + + if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ +@@ -1058,12 +1059,10 @@ + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); +- free(dev); + continue; + } + + d = cunescape(dev); +- free(dev); + + if (!d) + return -ENOMEM; +Index: git/src/tmpfiles.c +=================================================================== +--- git.orig/src/tmpfiles.c 2011-06-03 23:30:06.022302093 +0200 ++++ git/src/tmpfiles.c 2011-06-03 23:50:17.207573272 +0200 +@@ -66,7 +66,7 @@ + typedef struct Item { + char type; + +- char *path; ++ char path[50]; + uid_t uid; + gid_t gid; + mode_t mode; +@@ -619,7 +619,6 @@ + static void item_free(Item *i) { + assert(i); + +- free(i->path); + free(i); + } + +@@ -654,7 +653,7 @@ + + static int parse_line(const char *fname, unsigned line, const char *buffer) { + Item *i, *existing; +- char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; ++ char mode[50], user[50], group[50], age[50]; + Hashmap *h; + int r; + +@@ -669,17 +668,17 @@ + + if (sscanf(buffer, + "%c " +- "%ms " +- "%ms " +- "%ms " +- "%ms " +- "%ms", ++ "%s " ++ "%s " ++ "%s " ++ "%s " ++ "%s", + &i->type, + &i->path, +- &mode, +- &user, +- &group, +- &age) < 2) { ++ mode, ++ user, ++ group, ++ age) < 2) { + log_error("[%s:%u] Syntax error.", fname, line); + r = -EIO; + goto finish; +@@ -793,11 +792,6 @@ + r = 0; + + finish: +- free(user); +- free(group); +- free(mode); +- free(age); +- + if (i) + item_free(i); + +Index: git/src/mount.c +=================================================================== +--- git.orig/src/mount.c 2011-06-03 23:30:06.028972093 +0200 ++++ git/src/mount.c 2011-06-03 23:42:54.769805160 +0200 +@@ -24,6 +24,7 @@ + #include <mntent.h> + #include <sys/epoll.h> + #include <signal.h> ++#include <string.h>
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 261
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+ + #include "unit.h" + #include "mount.h" +@@ -1555,7 +1556,13 @@ + static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { + int r = 0; + unsigned i; +- char *device, *path, *options, *options2, *fstype, *d, *p, *o; ++ char *d, *p, *o; ++ char device[50];
White space.
Quoted 70 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +70
-0++ char path[50]; ++ char options[50]; ++ char options2[50]; ++ char fstype[50]; ++ + + assert(m); + +@@ -1564,26 +1571,26 @@ + for (i = 1;; i++) { + int k; + +- device = path = options = options2 = fstype = d = p = o = NULL; ++ d = p = o = NULL; + + if ((k = fscanf(m->proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ +- "%ms " /* (5) mount point */ +- "%ms" /* (6) mount options */ ++ "%49s " /* (5) mount point */ ++ "%49s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +- "%ms " /* (9) file system type */ +- "%ms" /* (10) mount source */ +- "%ms" /* (11) mount options 2 */ ++ "%49s " /* (9) file system type */ ++ "%49s" /* (10) mount source */ ++ "%49s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +- &path, +- &options, +- &fstype, +- &device, +- &options2)) != 5) { ++ path, ++ options, ++ fstype, ++ device, ++ options2)) != 5) { + + if (k == EOF) + break; +@@ -1607,22 +1614,12 @@ + r = k; + + clean_up: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); + } + + finish: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); +Index: git/src/umount.c
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 341
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+=================================================================== +--- git.orig/src/umount.c 2011-06-03 23:30:06.035642093 +0200 ++++ git/src/umount.c 2011-06-03 23:51:56.784001724 +0200 +@@ -60,7 +60,9 @@ + + static int mount_points_list_get(MountPoint **head) { + FILE *proc_self_mountinfo; +- char *path, *p; ++ char *p; ++ char path[50];
White space.
Quoted 50 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +50
-0++ + unsigned int i; + int r; + +@@ -72,17 +74,17 @@ + for (i = 1;; i++) { + int k; + MountPoint *m; +- char *root; ++ char root[50]; + bool skip_ro; + +- path = p = NULL; ++ p = NULL; + + if ((k = fscanf(proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ +- "%ms " /* (4) root */ +- "%ms " /* (5) mount point */ ++ "%49s " /* (4) root */ ++ "%49s " /* (5) mount point */ + "%*s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +@@ -90,24 +92,21 @@ + "%*s" /* (10) mount source */ + "%*s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +- &root, +- &path)) != 2) { ++ root, ++ path)) != 2) { + if (k == EOF) + break; + + log_warning("Failed to parse /proc/self/mountinfo:%u.", i); + +- free(path); + continue; + } + + /* If we encounter a bind mount, don't try to remount + * the source dir too early */ + skip_ro = !streq(root, "/"); +- free(root); + + p = cunescape(path); +- free(path);
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 401
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+ + if (!p) { + r = -ENOMEM; +@@ -152,28 +151,28 @@ + + for (i = 2;; i++) { + MountPoint *swap; +- char *dev = NULL, *d; ++ char *d; ++ char dev[50];
White space.
Quoted 44 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +27
-0++ + int k; + + if ((k = fscanf(proc_swaps, +- "%ms " /* device/file */ ++ "%50s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ + "%*s\n", /* priority */ +- &dev)) != 1) { ++ dev)) != 1) { + + if (k == EOF) + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); + +- free(dev); + continue; + } + + if (endswith(dev, "(deleted)")) { +- free(dev); + continue; + } +meta-oe/recipes-core/systemd/systemd_git.bb +1
-1@@ -15,7 +15,7 @@ inherit gitpkgv PKGV = "v${GITPKGVTAG}" PV = "git" -PR = "r5" +PR = "r6" inherit autotools vala@@ -23,9 +23,13 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
meta-oe/recipes-core/systemd/systemd_git.bb SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" · line 34
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd_git.bb +5
-1- file://paper-over-mkostemp.patch \ file://use-nonet-for-docbook.patch \ + ${UCLIBCPATCHES} \ " +UCLIBCPATCHES = "" +UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ + file://format-replace-m-uclibc.patch \ + " S = "${WORKDIR}/git"
Thanks,
Paul
Quoted 5 lines · Paul Menzel
Am Samstag, den 02.07.2011, 17:47 -0700 schrieb Khem Raj:
Quoted 2 lines
The patch is applied optionally only to uclibc builds Also move the mkostemp replacement patch to uclibc only list
A separate patch for that is better in my opinion.
I would think otherwise since the patches uclibc specific are being moved to this variable its better to do it all at once and it maintains bisectability
Other concerns I have addressed in v3
Quoted 503 lines
Quoted 24 lines
Signed-off-by Khem Raj<[email protected]>--- .../systemd/systemd/format-replace-m-uclibc.patch | 428 ++++++++++++++++++++ meta-oe/recipes-core/systemd/systemd_git.bb | 8 +- 2 files changed, 434 insertions(+), 2 deletions(-)create mode 100644
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patchmeta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0@@ -0,0 +1,428 @@ +Patch from Henning. %m is a glibc only thing. For uclibc we need to do it +differently. So we use static strings instead of mallocing them and free'ing + +I dont know if upstream systemd have plans to make systemd work on non +glibc system libraries if not then this patch would not make sense for +upstream + +Signed-off-by: Khem Raj<[email protected]> + +Index: git/src/mount-setup.cmeta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 20
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+=================================================================== +--- git.orig/src/mount-setup.c 2011-06-03 23:30:05.985617093 +0200 ++++ git/src/mount-setup.c 2011-06-03 23:51:15.446677362 +0200 +@@ -146,10 +146,11 @@ + + for (;;) { + MountPoint p; +- char *controller, *where; ++ char controller[30]; ++ char *where;White space looks different.
Quoted 95 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +95
-0+ int enabled = false; + +- if (fscanf(f, "%ms %*i %*i %i",&controller,&enabled) != 2) { ++ if (fscanf(f, "%29s %*i %*i %i", controller,&enabled) != 2) { + + if (feof(f)) + break; +@@ -160,12 +161,10 @@ + } + + if (!enabled) { +- free(controller); + continue; + } + + if (asprintf(&where, "/sys/fs/cgroup/%s", controller)< 0) { +- free(controller); + r = -ENOMEM; + goto finish; + } +@@ -179,7 +178,6 @@ + p.fatal = false; + + r = mount_one(&p); +- free(controller); + free(where); + + if (r< 0) +Index: git/src/socket-util.c +=================================================================== +--- git.orig/src/socket-util.c 2011-06-03 23:30:05.988952093 +0200 ++++ git/src/socket-util.c 2011-06-03 23:31:55.056790399 +0200 +@@ -192,7 +192,7 @@ + int socket_address_parse_netlink(SocketAddress *a, const char *s) { + int family; + unsigned group = 0; +- char* sfamily = NULL; ++ char sfamily[50]; + assert(a); + assert(s); + +@@ -200,17 +200,14 @@ + a->type = SOCK_RAW; + + errno = 0; +- if (sscanf(s, "%ms %u",&sfamily,&group)< 1) ++ if (sscanf(s, "%49s %u",&sfamily,&group)< 1) + return errno ? -errno : -EINVAL; + + if ((family = netlink_family_from_string(sfamily))< 0) + if (safe_atoi(sfamily,&family)< 0) { +- free(sfamily); + return -EINVAL; + } + +- free(sfamily); +- + a->sockaddr.nl.nl_family = AF_NETLINK; + a->sockaddr.nl.nl_groups = group; + +Index: git/src/cryptsetup-generator.c +=================================================================== +--- git.orig/src/cryptsetup-generator.c 2011-06-03 23:30:05.995622093 +0200 ++++ git/src/cryptsetup-generator.c 2011-06-03 23:31:55.056790399 +0200 +@@ -260,7 +260,7 @@ + + for (;;) { + char line[LINE_MAX], *l; +- char *name = NULL, *device = NULL, *password = NULL, *options = NULL; ++ char name[50], device[50], password[50], options[50] = NULL; + int k; + + if (!(fgets(line, sizeof(line), f))) +@@ -272,7 +272,7 @@ + if (*l == '#' || *l == 0) + continue; + +- if ((k = sscanf(l, "%ms %ms %ms %ms",&name,&device,&password,&options))< 2 || k> 4) { ++ if ((k = sscanf(l, "%s %s %s %s",&name,&device,&password,&options))< 2 || k> 4) { + log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); + r = EXIT_FAILURE; + goto next; +@@ -281,11 +281,7 @@ + if (create_disk(name, device, password, options)< 0) + r = EXIT_FAILURE; + +- next: +- free(name); +- free(device); +- free(password); +- free(options); ++ next:; + } + + finish:meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+Index: git/src/ask-password-api.c +=================================================================== +--- git.orig/src/ask-password-api.c 2011-06-03 23:30:06.002292093 +0200 ++++ git/src/ask-password-api.c 2011-06-03 23:31:55.056790399 +0200 +@@ -319,7 +319,7 @@ + + mkdir_p("/run/systemd/ask-password", 0755); + +- if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY))< 0) { ++ if ((fd = mkstemp(temp))< 0) {Some of these changes seem to have slipped in too. Could you put those into the other patch or is there another reason for that?
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 138
Quoted 13 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +13
-0+ log_error("Failed to create password file: %m"); + r = -errno; + goto finish; +Index: git/src/manager.c +=================================================================== +--- git.orig/src/manager.c 2011-06-03 23:30:06.008962093 +0200 ++++ git/src/manager.c 2011-06-03 23:31:55.060125399 +0200 +@@ -2623,7 +2623,7 @@ + return -ENOMEM; + + saved_umask = umask(0077); +- fd = mkostemp(path, O_RDWR|O_CLOEXEC); ++ fd = mkstemp(path);Dito.
Quoted 4 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +4
-0+ umask(saved_umask); + + if (fd< 0) { +Index: git/src/swap.cmeta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 152
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+=================================================================== +--- git.orig/src/swap.c 2011-06-03 23:30:06.015632093 +0200 ++++ git/src/swap.c 2011-06-03 23:31:55.060125399 +0200 +@@ -1043,11 +1043,12 @@ + (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n"); + + for (i = 1;; i++) { +- char *dev = NULL, *d; ++ char *d; ++ char dev[20];White space.
Quoted 99 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +99
-0+ int prio = 0, k; + + if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ +@@ -1058,12 +1059,10 @@ + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); +- free(dev); + continue; + } + + d = cunescape(dev); +- free(dev); + + if (!d) + return -ENOMEM; +Index: git/src/tmpfiles.c +=================================================================== +--- git.orig/src/tmpfiles.c 2011-06-03 23:30:06.022302093 +0200 ++++ git/src/tmpfiles.c 2011-06-03 23:50:17.207573272 +0200 +@@ -66,7 +66,7 @@ + typedef struct Item { + char type; + +- char *path; ++ char path[50]; + uid_t uid; + gid_t gid; + mode_t mode; +@@ -619,7 +619,6 @@ + static void item_free(Item *i) { + assert(i); + +- free(i->path); + free(i); + } + +@@ -654,7 +653,7 @@ + + static int parse_line(const char *fname, unsigned line, const char *buffer) { + Item *i, *existing; +- char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; ++ char mode[50], user[50], group[50], age[50]; + Hashmap *h; + int r; + +@@ -669,17 +668,17 @@ + + if (sscanf(buffer, + "%c " +- "%ms " +- "%ms " +- "%ms " +- "%ms " +- "%ms", ++ "%s " ++ "%s " ++ "%s " ++ "%s " ++ "%s", +&i->type, +&i->path, +-&mode, +-&user, +-&group, +-&age)< 2) { ++ mode, ++ user, ++ group, ++ age)< 2) { + log_error("[%s:%u] Syntax error.", fname, line); + r = -EIO; + goto finish; +@@ -793,11 +792,6 @@ + r = 0; + + finish: +- free(user); +- free(group); +- free(mode); +- free(age); +- + if (i) + item_free(i); + +Index: git/src/mount.c +=================================================================== +--- git.orig/src/mount.c 2011-06-03 23:30:06.028972093 +0200 ++++ git/src/mount.c 2011-06-03 23:42:54.769805160 +0200 +@@ -24,6 +24,7 @@ + #include<mntent.h> + #include<sys/epoll.h> + #include<signal.h> ++#include<string.h>meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 261
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+ + #include "unit.h" + #include "mount.h" +@@ -1555,7 +1556,13 @@ + static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { + int r = 0; + unsigned i; +- char *device, *path, *options, *options2, *fstype, *d, *p, *o; ++ char *d, *p, *o; ++ char device[50];White space.
Quoted 70 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +70
-0++ char path[50]; ++ char options[50]; ++ char options2[50]; ++ char fstype[50]; ++ + + assert(m); + +@@ -1564,26 +1571,26 @@ + for (i = 1;; i++) { + int k; + +- device = path = options = options2 = fstype = d = p = o = NULL; ++ d = p = o = NULL; + + if ((k = fscanf(m->proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ +- "%ms " /* (5) mount point */ +- "%ms" /* (6) mount options */ ++ "%49s " /* (5) mount point */ ++ "%49s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +- "%ms " /* (9) file system type */ +- "%ms" /* (10) mount source */ +- "%ms" /* (11) mount options 2 */ ++ "%49s " /* (9) file system type */ ++ "%49s" /* (10) mount source */ ++ "%49s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +-&path, +-&options, +-&fstype, +-&device, +-&options2)) != 5) { ++ path, ++ options, ++ fstype, ++ device, ++ options2)) != 5) { + + if (k == EOF) + break; +@@ -1607,22 +1614,12 @@ + r = k; + + clean_up: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); + } + + finish: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); +Index: git/src/umount.cmeta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 341
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+=================================================================== +--- git.orig/src/umount.c 2011-06-03 23:30:06.035642093 +0200 ++++ git/src/umount.c 2011-06-03 23:51:56.784001724 +0200 +@@ -60,7 +60,9 @@ + + static int mount_points_list_get(MountPoint **head) { + FILE *proc_self_mountinfo; +- char *path, *p; ++ char *p; ++ char path[50];White space.
Quoted 50 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +50
-0++ + unsigned int i; + int r; + +@@ -72,17 +74,17 @@ + for (i = 1;; i++) { + int k; + MountPoint *m; +- char *root; ++ char root[50]; + bool skip_ro; + +- path = p = NULL; ++ p = NULL; + + if ((k = fscanf(proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ +- "%ms " /* (4) root */ +- "%ms " /* (5) mount point */ ++ "%49s " /* (4) root */ ++ "%49s " /* (5) mount point */ + "%*s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +@@ -90,24 +92,21 @@ + "%*s" /* (10) mount source */ + "%*s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +-&root, +-&path)) != 2) { ++ root, ++ path)) != 2) { + if (k == EOF) + break; + + log_warning("Failed to parse /proc/self/mountinfo:%u.", i); + +- free(path); + continue; + } + + /* If we encounter a bind mount, don't try to remount + * the source dir too early */ + skip_ro = !streq(root, "/"); +- free(root); + + p = cunescape(path); +- free(path);meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 401
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +10
-0+ + if (!p) { + r = -ENOMEM; +@@ -152,28 +151,28 @@ + + for (i = 2;; i++) { + MountPoint *swap; +- char *dev = NULL, *d; ++ char *d; ++ char dev[50];White space.
Quoted 44 lines
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +27
-0++ + int k; + + if ((k = fscanf(proc_swaps, +- "%ms " /* device/file */ ++ "%50s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ + "%*s\n", /* priority */ +-&dev)) != 1) { ++ dev)) != 1) { + + if (k == EOF) + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); + +- free(dev); + continue; + } + + if (endswith(dev, "(deleted)")) { +- free(dev); + continue; + } +meta-oe/recipes-core/systemd/systemd_git.bb +1
-1@@ -15,7 +15,7 @@ inherit gitpkgv PKGV = "v${GITPKGVTAG}" PV = "git" -PR = "r5" +PR = "r6" inherit autotools vala@@ -23,9 +23,13 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \meta-oe/recipes-core/systemd/systemd_git.bb SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" · line 34
Quoted 10 lines
meta-oe/recipes-core/systemd/systemd_git.bb +5
-1- file://paper-over-mkostemp.patch \ file://use-nonet-for-docbook.patch \ + ${UCLIBCPATCHES} \ " +UCLIBCPATCHES = "" +UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ + file://format-replace-m-uclibc.patch \ + " S = "${WORKDIR}/git"Thanks,
Paul
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 2 lines · Khem Raj
+- if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) {
++ if ((fd = mkstemp(temp)) < 0) {This change looks like it will effectively remove O_CLOEXEC without reinstating it anywhere else. Have you verified this is a safe thing to do?
Quoted 2 lines
+- fd = mkostemp(path, O_RDWR|O_CLOEXEC); ++ fd = mkstemp(path);
Likewise.
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch line 158
Quoted 7 lines
++ char dev[20];
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +6
-0+ int prio = 0, k; + + if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */ + "%*s " /* type of swap */
Is 19 characters definitely enough? If this is potentially a pathname then it could be much longer than that.
p.
Quoted 7 lines · Phil Blundell
Quoted 2 lines · Khem Raj
+- if ((fd =
mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) { ++ if ((fd = mkstemp(temp)) < 0) {This change looks like it will effectively remove
O_CLOEXECwithout reinstating it anywhere else. Have you verified this is a safe thing to do?
Initial tests on uclibc seems to work well. but this needs more testing thats why the patch is only applied for uclibc based systems
Quoted 14 lines
Quoted 3 lines
+- fd =
mkostemp(path, O_RDWR|O_CLOEXEC);
++ fd = mkstemp(path);Likewise.
Quoted 7 lines
++ char dev[20];
+ int prio = 0, k;
+
+ if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */
+ "%*s " /* type of swap */
Quoted 3 lines
Is 19 characters definitely enough? If this is potentially a pathname then it could be much longer than that.
it just reads /dev/* so should be ok.
Quoted 9 lines
p.
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 11 lines · Khem Raj
Quoted 7 lines · Phil Blundell
Quoted 2 lines · Khem Raj
+- if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) { ++ if ((fd = mkstemp(temp)) < 0) {This change looks like it will effectively remove
O_CLOEXECwithout reinstating it anywhere else. Have you verified this is a safe thing to do?Initial tests on uclibc seems to work well. but this needs more testing thats why the patch is only applied for uclibc based systems
Just to reiterate what I mentioned on IRC the other day, I don't think empirical testing is the right way to address this problem, at least not in isolation. Absent an exceptionally comprehensive testsuite, there is too much risk that some kind of failure would be overlooked. I think code inspection is required here to establish whether O_CLOEXEC is needed and what to do about it. The easy answer to the latter is probably just to add an appropriate fcntl() call.
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
++ char dev[20];
meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file +6
-0+ int prio = 0, k; + + if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */ + "%*s " /* type of swap */
Quoted 5 lines
Quoted 3 lines
Is 19 characters definitely enough? If this is potentially a pathname then it could be much longer than that.
it just reads
/dev/*so should be ok.
I haven't checked the actual code, but the implication from the variable names and comments shown above is that it's reading /proc/swaps. If that's the case then, in the situation where you're swapping to a file, the pathnames involved could be arbitrarily long.
p.