Ping..
On 19-09-02 11:49, kka...@marvell.com wrote:
> From: Krzysztof Kanas <kka...@marvell.com>
>
> process_dup was intending to close it's own fd's but failed to do so
>
> Fixes: af75078fece3 ("first public release")
>
> Signed-off-by: Krzysztof Kanas <kka...@marvell.com>
> ---
> v2:
> * remove unnecessary commit msg information
>
> app/test/process.h | 40 +++++++++++++++++++++++++++++++++++-----
> 1 file changed, 35 insertions(+), 5 deletions(-)
>
> diff --git a/app/test/process.h b/app/test/process.h
> index 128ce41219a1..2a6428f104e1 100644
> --- a/app/test/process.h
> +++ b/app/test/process.h
> @@ -11,6 +11,7 @@
> #include <stdlib.h> /* NULL */
> #include <string.h> /* strerror */
> #include <unistd.h> /* readlink */
> +#include <dirent.h>
> #include <sys/wait.h>
>
> #include <rte_string_fns.h> /* strlcpy */
> @@ -40,8 +41,12 @@ process_dup(const char *const argv[], int numargs, const
> char *env_value)
> {
> int num;
> char *argv_cpy[numargs + 1];
> - int i, fd, status;
> + int i, fd, fdir, status;
> + struct dirent *dirent = NULL;
> + const char *procdir = "/proc/self/fd/";
> char path[32];
> + char *endptr;
> + DIR *dir = NULL;
> #ifdef RTE_LIBRTE_PDUMP
> pthread_t thread;
> #endif
> @@ -58,11 +63,36 @@ process_dup(const char *const argv[], int numargs, const
> char *env_value)
>
> /* close all open file descriptors, check /proc/self/fd to only
> * call close on open fds. Exclude fds 0, 1 and 2*/
> - for (fd = getdtablesize(); fd > 2; fd-- ) {
> - snprintf(path, sizeof(path), "/proc/" exe "/fd/%d", fd);
> - if (access(path, F_OK) == 0)
> - close(fd);
> + dir = opendir(procdir);
> +
> + if (dir == NULL) {
> + rte_panic("Error opening %s: %s\n", procdir,
> + strerror(errno));
> + }
> +
> + fdir = dirfd(dir);
> + if (fdir < 0) {
> + status = errno;
> + closedir(dir);
> + rte_panic("Error %d obtaining fd for dir %s: %s\n",
> + fdir, procdir, strerror(status));
> }
> +
> + while ((dirent = readdir(dir)) != NULL) {
> + errno = 0;
> + fd = strtol(dirent->d_name, &endptr, 10);
> + if (errno != 0 || dirent->d_name == endptr) {
> + printf("Error converint name fd %d %s:\n",
> + fd, dirent->d_name);
> + continue;
> + }
> +
> + if (fd == fdir || fd <= 2)
> + continue;
> +
> + close(fd);
> + }
> +
> printf("Running binary with argv[]:");
> for (i = 0; i < num; i++)
> printf("'%s' ", argv_cpy[i]);
> --
> 2.21.0
>
--
-
Regards,
Krzysztof(Chris) Kanas
