From patchwork Sat Jan 8 18:24:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 77970 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4F84AB7063 for ; Sun, 9 Jan 2011 05:26:54 +1100 (EST) Received: from localhost ([127.0.0.1]:52397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbdV5-00078P-8b for incoming@patchwork.ozlabs.org; Sat, 08 Jan 2011 13:26:51 -0500 Received: from [140.186.70.92] (port=46132 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbdSx-0006FG-IA for qemu-devel@nongnu.org; Sat, 08 Jan 2011 13:24:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PbdSw-0006u4-FC for qemu-devel@nongnu.org; Sat, 08 Jan 2011 13:24:39 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:62429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PbdSw-0006qZ-9T for qemu-devel@nongnu.org; Sat, 08 Jan 2011 13:24:38 -0500 Received: by mail-pz0-f45.google.com with SMTP id 2so4199800pzk.4 for ; Sat, 08 Jan 2011 10:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=AK+OlgzrVameFsz5CxuoWz+WIFC0a4oj3LDFX47svcc=; b=B4urpuyy/WooYwgwFt+nbqWM/aNtHlS4Drgkrx9RI5lWReClyrjTRFGOo0Vc0nWiXb CSU7//OOtGaBH8Whac4tCNM+uJ2q6MpZIt1yXutOdLhjQ2hu1gwkj6sfpkgYPFWXhFSo /le8f4YwQ2aXDcdN7W0IsmE4xwqIyDUGeDwKc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=V+TpnTz8Hsjo2xNl22LSYXBb7s+RZb0buj9EHj+PIx8IXrgu1np7NAGLDirr0TFJ1n fX9QeeCvrl2IK4A+dFbNeBYkJW70KnEj40rqHf7Ir/lsm24rJrJxRBd4z3M4V5TczSy5 3rPe7wftM1H6POcmPzqevjJOb+C5sDbvReemk= Received: by 10.142.11.9 with SMTP id 9mr2806071wfk.59.1294511077900; Sat, 08 Jan 2011 10:24:37 -0800 (PST) MIME-Version: 1.0 Received: by 10.142.241.1 with HTTP; Sat, 8 Jan 2011 10:24:17 -0800 (PST) From: Blue Swirl Date: Sat, 8 Jan 2011 18:24:17 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 2/7] loader: fix a file descriptor leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix a file descriptor leak, reported by cppcheck: [/src/qemu/hw/loader.c:311]: (error) Resource leak: fd Signed-off-by: Blue Swirl --- hw/loader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) if (e_ident[EI_CLASS] == ELFCLASS64) { diff --git a/hw/loader.c b/hw/loader.c index eb198f6..35d792e 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -307,8 +307,9 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), target_data_order = ELFDATA2LSB; } - if (target_data_order != e_ident[EI_DATA]) - return -1; + if (target_data_order != e_ident[EI_DATA]) { + goto fail; + } lseek(fd, 0, SEEK_SET);