kexec/fs2dt: Check for NULL pointer in dt_copy_old_root_param()
Subsystems (2)
PATCH v3 1/1 kexec/fs2dt: Check for NULL pointer in dt_copy_old_root_param()
In dt_copy_old_root_param(), FILE * returned from fopen is not checked for NULL pointer before passinig to fclose(). This could trigger a segfault. Patch to fix the same.
---
Changelog v2
-Removed redundant check fp
Changelog v1:
- Moved the check right after fopen
kexec/fs2dt.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
kexec/fs2dt.c +14 -12
@@ -524,19 +524,21 @@ static void dt_copy_old_root_param(void)strcpy (filename, pathname);strcat (filename,"bootargs" ); fp =fopen (filename,"r" ); -if (fp) { -if (getline (&last_cmdline, &len, fp) ==-1 ) -die ("unable to read %s\n" , filename); - - p =strstr (last_cmdline,"root=" ); -if (p) { - old_param =strtok (p," " ); - len =strlen (local_cmdline); -if (len !=0 ) -strcat (local_cmdline," " ); -strcat (local_cmdline, old_param); - } +if (!fp) +return ; + +if (getline (&last_cmdline, &len, fp) ==-1 ) +die ("unable to read %s\n" , filename); + + p =strstr (last_cmdline,"root=" ); +if (p) { + old_param =strtok (p," " ); + len =strlen (local_cmdline); +if (len !=0 ) +strcat (local_cmdline," " ); +strcat (local_cmdline, old_param); } +if (last_cmdline)free (last_cmdline);
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Simon Horman
AppliedQuoted 6 lines · Madhavan Srinivasan
In
dt_copy_old_root_param(), FILE * returned from fopen is not checked for NULL pointer before passinig tofclose(). This could trigger a segfault. Patch to fix the same.Signed-off-by Madhavan Srinivasan <[email protected]>
Thanks, applied.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 62 lines · Madhavan Srinivasan
In
dt_copy_old_root_param(), FILE * returned from fopen is not checked for NULL pointer before passinig tofclose(). This could trigger a segfault. Patch to fix the same.Signed-off-by Madhavan Srinivasan <[email protected]>---
Changelog v2
-Removed redundant check fpChangelog v1:
- Moved the check right after fopenkexec/fs2dt.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)kexec/fs2dt.c +14
-12@@ -524,19 +524,21 @@ static void dt_copy_old_root_param(void)strcpy (filename, pathname);strcat (filename,"bootargs" ); fp =fopen (filename,"r" ); -if (fp) { -if (getline (&last_cmdline, &len, fp) ==-1 ) -die ("unable to read %s\n" , filename); - - p =strstr (last_cmdline,"root=" ); -if (p) { - old_param =strtok (p," " ); - len =strlen (local_cmdline); -if (len !=0 ) -strcat (local_cmdline," " ); -strcat (local_cmdline, old_param); - } +if (!fp) +return ; + +if (getline (&last_cmdline, &len, fp) ==-1 ) +die ("unable to read %s\n" , filename); + + p =strstr (last_cmdline,"root=" ); +if (p) { + old_param =strtok (p," " ); + len =strlen (local_cmdline); +if (len !=0 ) +strcat (local_cmdline," " ); +strcat (local_cmdline, old_param); } +if (last_cmdline)free (last_cmdline);Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Thanks
Dave
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec