xtables: improve get_modprobe handling
PATCH 1/1 xtables: improve get_modprobe handling
In bug #455, Dmitry V. Levin proposed a more robust get_modprobe implementation. The patch below is a version of his patch, updated to apply to current git.
This closes bug #455.
Signed-off-by Phil Oester <[email protected]>
libxtables/xtables.c +11 -11
@@ -305,8 +305,8 @@ static char *get_modprobe(void) {int procfile;char *ret; +int count; -#define PROCFILE_BUFSIZ 1024 procfile =open (PROC_SYS_MODPROBE ,O_RDONLY );if (procfile <0 )return NULL ;
@@ -316,19 +316,19 @@ static char *get_modprobe(void)exit (1 ); } - ret =malloc (PROCFILE_BUFSIZ ); + ret =malloc (PATH_MAX );if (ret) { -memset (ret,0 ,PROCFILE_BUFSIZ ); -switch (read (procfile, ret,PROCFILE_BUFSIZ )) { -case -1 : goto fail; -case PROCFILE_BUFSIZ : goto fail;/* Partial read. Wierd */ + count =read (procfile, ret,PATH_MAX ); +if (count >0 && count <PATH_MAX ) + { +if (ret[count -1 ] =='\n' ) + ret[count -1 ] ='\0' ; +else + ret[count] ='\0' ; +close (procfile); +return ret; } -if (ret[strlen (ret)-1 ]=='\n' ) - ret[strlen (ret)-1 ]=0 ; -close (procfile); -return ret; } - fail:free (ret);close (procfile);return NULL ;
Quoted 5 lines · Phil Oester
In bug #455, Dmitry V. Levin proposed a more robust
get_modprobeimplementation. The patch below is a version of his patch, updated to apply to current git.This closes bug #455.
Applied, thanks Phil!