From patchwork Mon Apr  5 18:38:07 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [12/14] linux-user: Re-use load_elf_image for the main binary.
Date: Mon, 05 Apr 2010 08:38:07 -0000
From: Richard Henderson <rth@twiddle.net>
X-Patchwork-Id: 49420
Message-Id: <4BBA2E0F.9090802@twiddle.net>
To: malc <av1474@comtv.ru>
Cc: qemu-devel@nongnu.org

On 04/05/2010 11:14 AM, malc wrote:
>> +            }
>> +            interp_name = malloc(eppnt->p_filesz);
> 
> malloc can fail
> 
>> +
>> +            if (eppnt->p_offset + eppnt->p_filesz <= BPRM_BUF_SIZE) {
>> +                memcpy(interp_name, bprm_buf + eppnt->p_offset,
>> +                       eppnt->p_filesz);
>> +            } else {
>> +		retval = pread(image_fd, interp_name, eppnt->p_filesz,
> 
> Indentation seems off.

Huh.  I suspect that the whitespace fixup patch should have also
eliminated tabs.  I don't know how else that could have crept in
there, since I have tab-expansion enabled in emacs.

I'll incorporate the following into the next version.


r~

---


diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 7b854e2..e8eca86 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1327,12 +1327,15 @@ static void load_elf_image(const char *image_name, int image_fd,
                 goto exit_errmsg;
             }
             interp_name = malloc(eppnt->p_filesz);
+            if (!interp_name) {
+                goto exit_perror;
+            }
 
             if (eppnt->p_offset + eppnt->p_filesz <= BPRM_BUF_SIZE) {
                 memcpy(interp_name, bprm_buf + eppnt->p_offset,
                        eppnt->p_filesz);
             } else {
-		retval = pread(image_fd, interp_name, eppnt->p_filesz,
+                retval = pread(image_fd, interp_name, eppnt->p_filesz,
                                eppnt->p_offset);
                 if (retval != eppnt->p_filesz) {
                     goto exit_perror;