Add secure gethostname() wrapper
PATCH 1/1 Add secure gethostname() wrapper
gethostname() func does not ensure null-terminated string if hostname is longer than buffer length.
For security, a function s_gethostname() has been added to ensure that "\0" is added to the end of the buffer. Previously this had to be handled in each place of the gethostname() call.
Signed-off-by Blazej Kucman <[email protected]>
--- Monitor.c | 3 +-- lib.c | 19 +++++++++++++++++++ mapfile.c | 3 +-- mdadm.c | 3 +-- mdadm.h | 1 + super-ddf.c | 3 +-- 6 files changed, 24 insertions(+), 8 deletions(-)
Monitor.c +1 -2
@@ -222,11 +222,10 @@ int Monitor(struct mddev_dev *devlist, info.dosyslog = dosyslog; info.test = c->test; -if (gethostname (info.hostname,sizeof (info.hostname)) !=0 ) { +if (s_gethostname (info.hostname,sizeof (info.hostname)) !=0 ) {pr_err ("Cannot get hostname.\n" );return 1 ; } - info.hostname[sizeof (info.hostname) -1 ] ='\0' ;if (share){if (check_one_sharer (c->scan) ==2 )
lib.c +19 -0
@@ -585,3 +585,22 @@ int parse_num(int *dest, const char *num) *dest = temp;return 0 ; } + +/** +* s_gethostname() - secure get hostname. Assure null-terminated string. +* +* @buf: buffer for hostname. +* @buf_len: buffer length. +* +* Return: gethostname() result. +*/ +int s_gethostname (char *buf,int buf_len) +{ +assert (buf); + +int ret =gethostname (buf, buf_len); + + buf[buf_len -1 ] =0 ; + +return ret; +}
mapfile.c +1 -2
@@ -363,8 +363,7 @@ void RebuildMap(void)char *homehost =conf_get_homehost (&require_homehost);if (homehost ==NULL ||strcmp (homehost,"<system>" )==0 ) { -if (gethostname (sys_hostname,sizeof (sys_hostname)) ==0 ) { - sys_hostname[sizeof (sys_hostname)-1 ] =0 ; +if (s_gethostname (sys_hostname,sizeof (sys_hostname)) ==0 ) { homehost = sys_hostname; } }
mdadm.c +1 -2
@@ -1340,8 +1340,7 @@ int main(int argc, char *argv[])if (c.homehost ==NULL && c.require_homehost) c.homehost =conf_get_homehost (&c.require_homehost);if (c.homehost ==NULL ||strcasecmp (c.homehost,"<system>" ) ==0 ) { -if (gethostname (sys_hostname,sizeof (sys_hostname)) ==0 ) { - sys_hostname[sizeof (sys_hostname)-1 ] =0 ; +if (s_gethostname (sys_hostname,sizeof (sys_hostname)) ==0 ) { c.homehost = sys_hostname; } }
mdadm.h +1 -0
@@ -1805,6 +1805,7 @@ extern void set_dlm_hooks(void);extern void sleep_for (unsigned int sec,long nsec,bool wake_after_interrupt);extern bool is_directory (const char *path);extern bool is_file (const char *path); +extern int s_gethostname (char *buf,int buf_len);#define _ROUND_UP (val, base) (((val) + (base) - 1) & ~(base - 1))#define ROUND_UP (val, base) _ROUND_UP(val, (typeof(val))(base))
super-ddf.c +1 -2
@@ -2364,8 +2364,7 @@ static int init_super_ddf(struct supertype *st,* Remaining 16 are serial number.... maybe a hostname would do? */ memcpy (ddf->controller.guid,T10 ,sizeof (T10 )); -gethostname (hostname,sizeof (hostname)); - hostname[sizeof (hostname) -1 ] =0 ; +s_gethostname (hostname,sizeof (hostname)); hostlen =strlen (hostname);memcpy (ddf->controller.guid +24 - hostlen, hostname, hostlen);for (i =strlen (T10 ) ; i+hostlen <24 ; i++)
Signature · 1 line
2.35.3
Jes Sorensen
AppliedQuoted 8 lines · Blazej Kucman
gethostname()func does not ensure null-terminated string if hostname is longer than buffer length.
For security, a functions_gethostname()has been added to ensure that "\0" is added to the end of the buffer. Previously this had to be handled in each place of thegethostname()call.Signed-off-by Blazej Kucman <[email protected]>
Quoted 8 lines
--- Monitor.c | 3 +-- lib.c | 19 +++++++++++++++++++ mapfile.c | 3 +-- mdadm.c | 3 +-- mdadm.h | 1 + super-ddf.c | 3 +-- 6 files changed, 24 insertions(+), 8 deletions(-)
Applied!
Thanks,
Jes