From 48cd9dc104082d4106ccd81fa3feec0d514ddd08 Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Fri, 19 Jun 2015 18:38:25 +0300
Subject: [PATCH] syslinux_parse: assorted issues found by Coverity

1. Remove unneeded NULL check
CID: 96607

2. Do not allocate storage for initrd, copy it directly from input
buffer. Avoids memory leak in failure path.
CID: 96604

3. Unchecked error return from print()
CID: 96601, 73595
---
 grub-core/lib/syslinux_parse.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c
index ba71a4831..28ba3aef0 100644
--- a/grub-core/lib/syslinux_parse.c
+++ b/grub-core/lib/syslinux_parse.c
@@ -874,7 +874,9 @@ print_config (struct output_buffer *outbuf,
   print_string ("#");
   print_file (outbuf, menu, filename, NULL);
   print_string (" ");
-  print (outbuf, newname, grub_strlen (newname));
+  err = print (outbuf, newname, grub_strlen (newname));
+  if (err)
+    return err;
   print_string (":\n");
 
   for (menuptr = menu; menuptr; menuptr = menuptr->parent, depth++)
@@ -944,8 +946,8 @@ write_entry (struct output_buffer *outbuf,
     {
     case KERNEL_LINUX:
       {
-	char *ptr;
-	char *initrd = NULL;
+	const char *ptr;
+	const char *initrd = NULL, *initrde= NULL;
 	for (ptr = curentry->append; ptr && *ptr; ptr++)
 	  if ((ptr == curentry->append || grub_isspace (ptr[-1]))
 	      && grub_strncasecmp (ptr, "initrd=", sizeof ("initrd=") - 1)
@@ -953,12 +955,8 @@ write_entry (struct output_buffer *outbuf,
 	    break;
 	if (ptr && *ptr)
 	  {
-	    char *ptr2;
-	    initrd = grub_strdup(ptr + sizeof ("initrd=") - 1);
-	    if (!initrd)
-	      return grub_errno;
-	    for (ptr2 = initrd; *ptr2 && !grub_isspace (*ptr2); ptr2++);
-	    *ptr2 = 0;
+	    initrd = ptr + sizeof ("initrd=") - 1;
+	    for (initrde = initrd; *initrde && !grub_isspace (*initrde); initrde++);
 	  }
 	print_string (" if test x$grub_platform = xpc; then "
 		      "linux_suffix=16; else linux_suffix= ; fi\n");
@@ -966,7 +964,11 @@ write_entry (struct output_buffer *outbuf,
 	print_file (outbuf, menu, curentry->kernel_file, NULL);
 	print_string (" ");
 	if (curentry->append)
-	  print (outbuf, curentry->append, grub_strlen (curentry->append));
+	  {
+	    err = print (outbuf, curentry->append, grub_strlen (curentry->append));
+	    if (err)
+	      return err;
+	  }
 	print_string ("\n");
 	if (initrd || curentry->initrds)
 	  {
@@ -974,7 +976,7 @@ write_entry (struct output_buffer *outbuf,
 	    print_string ("  initrd$linux_suffix ");
 	    if (initrd)
 	      {
-		print_file (outbuf, menu, initrd, NULL);
+		print_file (outbuf, menu, initrd, initrde);
 		print_string (" ");
 	      }
 	    for (lst = curentry->initrds; lst; lst = lst->next)
@@ -985,7 +987,6 @@ write_entry (struct output_buffer *outbuf,
 
 	    print_string ("\n");
 	  }
-	grub_free (initrd);
       }
       break;
     case KERNEL_CHAINLOADER:
@@ -1197,8 +1198,7 @@ write_entry (struct output_buffer *outbuf,
 		  ptr++;
 		i386e = ptr;
 	      }
-	    if (lme)
-	      *lme = '\0';
+	    *lme = '\0';
 	    if (paee)
 	      *paee = '\0';
 	    if (i386e)