From patchwork Mon Nov 9 20:53:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 7586491 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E67449F2F7 for ; Mon, 9 Nov 2015 20:54:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2987620747 for ; Mon, 9 Nov 2015 20:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 499872066D for ; Mon, 9 Nov 2015 20:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751734AbbKIUyA (ORCPT ); Mon, 9 Nov 2015 15:54:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56182 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbbKIUyA (ORCPT ); Mon, 9 Nov 2015 15:54:00 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 41B6019F203; Mon, 9 Nov 2015 20:54:00 +0000 (UTC) Received: from hawk.localdomain.com (ovpn-116-60.ams2.redhat.com [10.36.116.60]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA9KruS7011100; Mon, 9 Nov 2015 15:53:57 -0500 From: Andrew Jones To: pbonzini@redhat.com, kvm@vger.kernel.org Cc: alex.bennee@linaro.org, cov@codeaurora.org, thuth@redhat.com Subject: [kvm-unit-tests PATCH v2 02/19] trivial: lib: fail hard on failed mallocs Date: Mon, 9 Nov 2015 15:53:53 -0500 Message-Id: <1447102433-20322-1-git-send-email-drjones@redhat.com> In-Reply-To: <1446769483-21586-3-git-send-email-drjones@redhat.com> References: <1446769483-21586-3-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's pretty safe to not even bother checking for NULL when using malloc and friends, but if we do check, then fail hard. Signed-off-by: Andrew Jones Reviewed-by: Thomas Huth --- v2: no code in asserts [Thomas Huth] lib/virtio-mmio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/virtio-mmio.c b/lib/virtio-mmio.c index 043832299174e..5ccbd193a264a 100644 --- a/lib/virtio-mmio.c +++ b/lib/virtio-mmio.c @@ -54,8 +54,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, vq = calloc(1, sizeof(*vq)); queue = memalign(PAGE_SIZE, VIRTIO_MMIO_QUEUE_SIZE_MIN); - if (!vq || !queue) - return NULL; + assert(vq && queue); writel(index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL); @@ -162,8 +161,7 @@ static struct virtio_device *virtio_mmio_dt_bind(u32 devid) return NULL; vm_dev = calloc(1, sizeof(*vm_dev)); - if (!vm_dev) - return NULL; + assert(vm_dev != NULL); vm_dev->base = info.base; vm_device_init(vm_dev);