[OE-core] [PATCH 1/6] 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.y...@windriver.com --- .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch 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 000..607305b --- /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.y...@windriver.com +Acked-by: Darren Hart dvh...@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; +- charbuf[256]; ++ charbuf[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 d231268..f97de7f 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 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/6] e2fsprogs: the max length of debugfs argument is too short
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: 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.y...@windriver.com Acked-by: Darren Hart dvh...@linux.intel.com --- .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch 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 000..607305b --- /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.y...@windriver.com +Acked-by: Darren Hart dvh...@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; +-charbuf[256]; ++charbuf[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 d231268..f97de7f 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 -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core