From patchwork Wed Jan 25 14:16:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lilydjwg--- via Elfutils-devel X-Patchwork-Id: 63675 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3783A3858C3A for ; Wed, 25 Jan 2023 14:17:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3783A3858C3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674656248; bh=vgcTqVXmMI0Jc8CErgC/lflyXS+yyrm3tYsvNMgIVi4=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Help:List-Subscribe:From:Reply-To:From; b=vKdyabjbCloNmELPpIbQpi6IKTnRJi0hLo49bKRGUFzizMg5k60rIpjSKgPdzHigl yVRzyCgVD7r24H+dQqxSjMy2ItbwVA/3PTr3Aby1mRWlzCR92rz0wqPvTStocN7QHj y0C7BUycb6A3Evv659cuplcCijFOams9B0bvw5wM= X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by sourceware.org (Postfix) with ESMTPS id D97043858D28 for ; Wed, 25 Jan 2023 14:17:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D97043858D28 Received: by mail-wr1-x449.google.com with SMTP id h17-20020a5d5491000000b002bfb1375c4eso901439wrv.17 for ; Wed, 25 Jan 2023 06:17:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vgcTqVXmMI0Jc8CErgC/lflyXS+yyrm3tYsvNMgIVi4=; b=MnbpR8zGhVVIJ4HDhU0IQ03tbvre/7U/UGjN1nHahvbg0Zxl3wLUVx2/1MgcHI+x1X 0ZAwXJk4lGx/A0VJzCNmC0bWZrn9ucHO9sSaZAMG3JzJAtLRMlznW5hl0BM9TZ8GqRlH UIFPmBOhmawefntwx7d9L5X2A2ow9i2DVD1wElnXYjahaxqYN0cUlPaOIWPEfyNXF77d KM8dYz3NHAM0Ha93F5ct80+bai6roSac/C802TL6i3PCS19XPIn+u3gyDC+HxWDMIvZz bw4Y3QgwBt21ibzFL2Rm97iIvkZX2xropE3oxeuoZUCl/8G/W4tMbAA+bpDM1y+uKkRi jSUw== X-Gm-Message-State: AO0yUKVJgz0eOLd1Ngikwml3UUb2Kr4C89IHbFDY/v3K2/dkEmWUjWxq QpTov29QrAfkF+kEtawPLxgLXXbNfyvhPxtZO8Sh6t2JEZ608+L2+4RkURBlyoi8MSWiASDi9aK clECfCjt74i0+OTCFFBbl+tKnZrm7ZcRiGzR9XNY8nAE4pNNqWqvrmQ2icyHaF5cspuisr9Q= X-Google-Smtp-Source: AK7set8biooR4x6iC20rULv/FJubUQfv7mN+VY4Mdwq/NwGSNsKsypXW4IbSO/7Bj14ptm/O1Kbo3CY7NpY= X-Received: from vvvvvv-dev.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:472]) (user=vvvvvv job=sendgmr) by 2002:a05:600c:3659:b0:3d1:fcac:3c93 with SMTP id y25-20020a05600c365900b003d1fcac3c93mr113796wmq.0.1674656236302; Wed, 25 Jan 2023 06:17:16 -0800 (PST) Date: Wed, 25 Jan 2023 14:16:57 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.405.gd4c25cc71f-goog Message-ID: <20230125141657.881588-1-vvvvvv@google.com> Subject: [PATCH] libdwfl: add check for elf_memory return value To: elfutils-devel@sourceware.org Cc: kernel-team@android.com, maennich@google.com, vvvvvv@google.com X-Spam-Status: No, score=-21.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Aleksei Vetrov via Elfutils-devel From: lilydjwg--- via Elfutils-devel Reply-To: vvvvvv@google.com Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" From: Aleksei Vetrov elf_memory call in __libdw_open_elf_memory can return NULL. It was not checked and led to the null pointer dereference. Signed-off-by: Aleksei Vetrov --- libdwfl/open.c | 4 ++++ tests/dwfl-report-offline-memory.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libdwfl/open.c b/libdwfl/open.c index b97ff016..d0f357ed 100644 --- a/libdwfl/open.c +++ b/libdwfl/open.c @@ -211,6 +211,10 @@ __libdw_open_elf_memory (char *data, size_t size, Elf **elfp, bool archive_ok) won't work. */ int fd = -1; *elfp = elf_memory (data, size); + if (unlikely(*elfp == NULL)) + { + return DWFL_E_LIBELF; + } /* Allow using this ELF as reference for subsequent elf_begin calls. */ (*elfp)->cmd = ELF_C_READ_MMAP_PRIVATE; return libdw_open_elf (&fd, elfp, false, archive_ok, true, false, true); diff --git a/tests/dwfl-report-offline-memory.c b/tests/dwfl-report-offline-memory.c index e6cb0a51..b3b4d9bd 100644 --- a/tests/dwfl-report-offline-memory.c +++ b/tests/dwfl-report-offline-memory.c @@ -77,8 +77,13 @@ main (int argc, char **argv) Dwfl *dwfl = dwfl_begin (&offline_callbacks); assert (dwfl != NULL); - Dwfl_Module *mod = - dwfl_report_offline_memory (dwfl, argv[1], argv[1], data, size); + Dwfl_Module *mod; + + /* Check error handling by suppling zero data */ + mod = dwfl_report_offline_memory(dwfl, argv[1], argv[1], NULL, 0); + assert(mod == NULL); + + mod = dwfl_report_offline_memory(dwfl, argv[1], argv[1], data, size); assert (mod != NULL); dwfl_report_end (dwfl, NULL, NULL);