From nobody Fri May 3 02:28:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524352969296407.3828748562984; Sat, 21 Apr 2018 16:22:49 -0700 (PDT) Received: from localhost ([::1]:56336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fA1pz-00039o-7C for importer@patchew.org; Sat, 21 Apr 2018 19:22:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fA1oz-0002g8-RX for qemu-devel@nongnu.org; Sat, 21 Apr 2018 19:21:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fA1ow-00007Z-Nx for qemu-devel@nongnu.org; Sat, 21 Apr 2018 19:21:33 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fA1ow-00007O-Ix for qemu-devel@nongnu.org; Sat, 21 Apr 2018 19:21:30 -0400 Received: by mail-qk0-x242.google.com with SMTP id b131so8105739qkg.2 for ; Sat, 21 Apr 2018 16:21:30 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id m10sm4213423qkh.20.2018.04.21.16.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 16:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=C9ZG0YZoImmWnFDza3d4PybStWPnKJazdNHlVP5nw3o=; b=ml+jHlX0WzIMN+Gomqn3HUFvy5xy8MoYIqy3kPWZbsnQVhe9ijhs5CzGaaU+Ct8Nf3 FFrpMd76rXMEZqnjnwtcVJRBCZhTXJe+59TccpUKm+mojcckIMZqCZfrJaFJdiPo8iPt t/bW0wWN47hnN7Mc8h3e8ShoM3UD9etEQIUnpjf0x1YwIi0reNPQZ9DpS1a2+yFQtnfC GWI7GjXlwbVCLgC5QsEefPTayNX7myUPbhd1+/CALY+kHvJUaGPtto3vz5iUR3Ctp44C +CZMtiTNwQj7jD4IdTJQoh0UVRsMwyVmq82iSWvrq4i4olgIiFwwtvLewGTaXlZrcebG 8F1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=C9ZG0YZoImmWnFDza3d4PybStWPnKJazdNHlVP5nw3o=; b=SbBPXOcc+pv0M4X3JKBAvCVSE+z/hwKMbwDfSNbjxseEqvkJlMr/jsZlx3CtI/TWiN EE5eptzT1fWVPTokoC6OpcqB9BKpKxU9VMml+UGHQD3F35tiAYVN2iVeN3yG6WYQAr0J 4nYoi4DsraXzGKf1OawyEUvLV00Ic9kTL/Hd6uZLEYwvaPsW8jQGHdZq2XiOBaRHtcjO 2ol/IbxMBUq/QJjAvxh8Li7Rt0jWvL/66ILlW+EUn2q6XUVuTOrvPyCiJcUg/sBUiinF 1kxkO8izjvQBR3sMSPtAFA5tmq/KQHZAXrzXV/XVD1X9u0zHGBoUxSc1U6mMGyqFwqRd JR2g== X-Gm-Message-State: ALQs6tAqWtPHQmjvGvBu7m0NPQk7+YkPAMHhSEwOxHsbrIIveTcCQizc q28bfbdOaD7TbVQu23bSkBI= X-Google-Smtp-Source: AB8JxZr01u9g9VrjTzf+PlqBUc5tU//2WTwOUZ285WcQ4bwDkG3gJH/sOJxZVXbLTXU04+0mRVfkmQ== X-Received: by 10.55.18.35 with SMTP id c35mr17127660qkh.165.1524352890119; Sat, 21 Apr 2018 16:21:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Filippov Date: Sat, 21 Apr 2018 20:21:20 -0300 Message-Id: <20180421232120.22208-1-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH] elf-loader: Avoid calling qsort(NULL, 0, ...) call X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This fixes the following ASan warning: $ qemu-system-xtensa -M kc705 -m 128M -semihosting -nographic -monitor nu= ll -kernel Image.elf include/hw/elf_ops.h:179:5: runtime error: null pointer passed as argumen= t 1, which is declared to never be null Reported-by: AddressSanitizer Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/elf_ops.h | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index b6e19e35d0..f0ac7c6c4e 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -110,7 +110,7 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr, = int fd, int must_swab, struct elf_shdr *symtab, *strtab, *shdr_table =3D NULL; struct elf_sym *syms =3D NULL; struct syminfo *s; - int nsyms, i; + int nsyms, i, ret =3D -1; char *str =3D NULL; =20 shdr_table =3D load_at(fd, ehdr->e_shoff, @@ -143,6 +143,7 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr, = int fd, int must_swab, if (!str) { goto fail; } + ret =3D 0; =20 i =3D 0; while (i < nsyms) { @@ -170,30 +171,34 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr= , int fd, int must_swab, } i++; } - syms =3D g_realloc(syms, nsyms * sizeof(*syms)); + if (nsyms) { + syms =3D g_realloc(syms, nsyms * sizeof(*syms)); =20 - qsort(syms, nsyms, sizeof(*syms), glue(symcmp, SZ)); - for (i =3D 0; i < nsyms - 1; i++) { - if (syms[i].st_size =3D=3D 0) { - syms[i].st_size =3D syms[i + 1].st_value - syms[i].st_value; + qsort(syms, nsyms, sizeof(*syms), glue(symcmp, SZ)); + for (i =3D 0; i < nsyms - 1; i++) { + if (syms[i].st_size =3D=3D 0) { + syms[i].st_size =3D syms[i + 1].st_value - syms[i].st_valu= e; + } } + + /* Commit */ + s =3D g_malloc0(sizeof(*s)); + s->lookup_symbol =3D glue(lookup_symbol, SZ); + glue(s->disas_symtab.elf, SZ) =3D syms; + s->disas_num_syms =3D nsyms; + s->disas_strtab =3D str; + s->next =3D syminfos; + syminfos =3D s; + + goto out; } =20 - /* Commit */ - s =3D g_malloc0(sizeof(*s)); - s->lookup_symbol =3D glue(lookup_symbol, SZ); - glue(s->disas_symtab.elf, SZ) =3D syms; - s->disas_num_syms =3D nsyms; - s->disas_strtab =3D str; - s->next =3D syminfos; - syminfos =3D s; - g_free(shdr_table); - return 0; fail: g_free(syms); g_free(str); + out: g_free(shdr_table); - return -1; + return ret; } =20 static int glue(elf_reloc, SZ)(struct elfhdr *ehdr, int fd, int must_swab, --=20 2.17.0