From patchwork Mon Dec 2 07:19:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhouyi Zhou X-Patchwork-Id: 295813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D6FAA2C007C for ; Mon, 2 Dec 2013 18:20:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190Ab3LBHUD (ORCPT ); Mon, 2 Dec 2013 02:20:03 -0500 Received: from mail-pb0-f54.google.com ([209.85.160.54]:55567 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124Ab3LBHUB (ORCPT ); Mon, 2 Dec 2013 02:20:01 -0500 Received: by mail-pb0-f54.google.com with SMTP id un15so18221237pbc.41 for ; Sun, 01 Dec 2013 23:20:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=uDedHHEVLAfjcvHq5+xjI8Z1mpC4UTjfhfdQom01Rw0=; b=dBPYMGuvD8Irt3RIuYSuyh6UfMvGNo8SI4gp1E1sCsHvOAHQzdLYslZBznIfOhksWs gcvzDuXscBrg75J2K/pNvB3NWdz6yM4tT/iZclpLz5iBTjB8ttnyOXgToHIaClkuoBnq fO5aXxj8u2Gh84Pc8r+ba3oGQiABrcInc77IszdtpwoPkMYMv4UJeIADE8i/jsUStKpv BM/a2nlZOocKcHEbOG60wrSDaJFAU0fvjGVt7oEGN+Lne57a4qDy0ypsJYZBt57l0jms NXL1VXDpP7K5BtL8g7riG/nSvH4RjyUlVD16nQLV1vcAM/7PN4HPzzQLP2ofNqAGxbm2 QV6w== X-Received: by 10.66.139.8 with SMTP id qu8mr1789570pab.157.1385968800478; Sun, 01 Dec 2013 23:20:00 -0800 (PST) Received: from localhost.localdomain ([159.226.43.61]) by mx.google.com with ESMTPSA id z10sm9704520pas.6.2013.12.01.23.19.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 01 Dec 2013 23:20:00 -0800 (PST) From: zhouzhouyi@gmail.com To: , , , , , , Cc: Zhouyi Zhou Subject: re: ping: re:[PATCH 1/1] kernel code that do not handle NULL return of kmem_cache_zalloc Date: Mon, 2 Dec 2013 15:19:44 +0800 Message-Id: <1385968784-25901-1-git-send-email-zhouzhouyi@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org From: Zhouyi Zhou the text of previous ping message maybe garbled sorry for the trouble > I do a grep for kmem_cache_zalloc and kmem_cache_alloc > in kernel tree, and find some code do not handle NULL > return of kmem_cache_zalloc correctly > Signed-off-by: Zhouyi Zhou --- arch/powerpc/kvm/book3s_32_mmu_host.c | 5 +++++ drivers/iommu/omap-iommu.c | 3 ++- fs/jffs2/malloc.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_32_mmu_host.c b/arch/powerpc/kvm/book3s_32_mmu_host.c index 3a0abd2..5fac89d 100644 --- a/arch/powerpc/kvm/book3s_32_mmu_host.c +++ b/arch/powerpc/kvm/book3s_32_mmu_host.c @@ -243,6 +243,11 @@ next_pteg: /* Now tell our Shadow PTE code about the new page */ pte = kvmppc_mmu_hpte_cache_next(vcpu); + if (!pte) { + kvm_release_pfn_clean(hpaddr >> PAGE_SHIFT); + r = -EAGAIN; + goto out; + } dprintk_mmu("KVM: %c%c Map 0x%llx: [%lx] 0x%llx (0x%llx) -> %lx\n", orig_pte->may_write ? 'w' : '-', diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index bcd78a7..5155714 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -551,7 +551,8 @@ static u32 *iopte_alloc(struct omap_iommu *obj, u32 *iopgd, u32 da) dev_vdbg(obj->dev, "%s: a new pte:%p\n", __func__, iopte); } else { /* We raced, free the reduniovant table */ - iopte_free(iopte); + if (iopte) + iopte_free(iopte); } pte_ready: diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c index 4f47aa2..58e2336 100644 --- a/fs/jffs2/malloc.c +++ b/fs/jffs2/malloc.c @@ -287,6 +287,8 @@ struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void) { struct jffs2_xattr_datum *xd; xd = kmem_cache_zalloc(xattr_datum_cache, GFP_KERNEL); + if (!xd) + return NULL; dbg_memalloc("%p\n", xd); xd->class = RAWNODE_CLASS_XATTR_DATUM; @@ -305,6 +307,8 @@ struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void) { struct jffs2_xattr_ref *ref; ref = kmem_cache_zalloc(xattr_ref_cache, GFP_KERNEL); + if (!ref) + return NULL; dbg_memalloc("%p\n", ref); ref->class = RAWNODE_CLASS_XATTR_REF;