diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2013-07-18 17:50:50 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:42:11 +0100 |
| commit | a916a127768291ca7c614976e05c90153fec2956 (patch) | |
| tree | 3192b2f062b2ba88f3ab980c3d72974876873c29 | |
| parent | a598242197312fa6d43179c283da2d0873de2919 (diff) | |
| download | openembedded-core-a916a127768291ca7c614976e05c90153fec2956.tar.gz openembedded-core-a916a127768291ca7c614976e05c90153fec2956.tar.bz2 openembedded-core-a916a127768291ca7c614976e05c90153fec2956.zip | |
e2fsprogs: the max length of debugfs argument is too short
The max length of debugfs argument is 256 which is too short, the
arguments are two paths, the PATH_MAX is 4096 according to
/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux
systems), that's also what the ss library uses.
This patch has been reviewed by the linux-ext4 mailing list, but isn't
merged atm.
[YOCTO #3848]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch new file mode 100644 index 0000000000..607305be54 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch @@ -0,0 +1,41 @@ +debugfs.c: the max length of debugfs argument is too short + +The max length of debugfs argument is 256 which is too short, the +arguments are two paths, the PATH_MAX is 4096 according to +/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux +systems), that's also what the ss library uses. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Acked-by: Darren Hart <dvhart@linux.intel.com> +--- + debugfs/debugfs.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c ++++ b/debugfs/debugfs.c +@@ -37,6 +37,10 @@ extern char *optarg; + #include "../version.h" + #include "jfs_user.h" + ++#ifndef BUFSIZ ++#define BUFSIZ 8192 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -2311,7 +2315,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) + static int source_file(const char *cmd_file, int ss_idx) + { + FILE *f; +- char buf[256]; ++ char buf[BUFSIZ]; + char *cp; + int exit_status = 0; + int retval; +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index 928a0cd688..319728ee57 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -3,6 +3,7 @@ require e2fsprogs.inc SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \ + file://debugfs-too-short.patch \ " SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4" |