emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

lib: check NULL before freeing passwd data

Browse Source 
Add an additional NULL check condition in spw_free() and pw_free() to
avoid freeing an already empty pointer.

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa
2021-11-18 16:48:26 +01:00
parent 02916e9cb2
commit d594243fbb
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pwmem.c
View File

@@ -93,6 +93,7 @@
void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent) void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent)
{ {
if (pwent != NULL) {
free (pwent->pw_name); free (pwent->pw_name);
if (pwent->pw_passwd) { if (pwent->pw_passwd) {
memzero (pwent->pw_passwd, strlen (pwent->pw_passwd)); memzero (pwent->pw_passwd, strlen (pwent->pw_passwd));
@@ -102,5 +103,6 @@ void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent)
free (pwent->pw_dir); free (pwent->pw_dir);
free (pwent->pw_shell); free (pwent->pw_shell);
free (pwent); free (pwent);
}
} }

2
lib/shadowmem.c
View File

@@ -79,11 +79,13 @@
void spw_free (/*@out@*/ /*@only@*/struct spwd *spent) void spw_free (/*@out@*/ /*@only@*/struct spwd *spent)
{ {
if (spent != NULL) {
free (spent->sp_namp); free (spent->sp_namp);
if (NULL != spent->sp_pwdp) { if (NULL != spent->sp_pwdp) {
memzero (spent->sp_pwdp, strlen (spent->sp_pwdp)); memzero (spent->sp_pwdp, strlen (spent->sp_pwdp));
free (spent->sp_pwdp); free (spent->sp_pwdp);
} }
free (spent); free (spent);
}
} }