From patchwork Tue Apr 21 12:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 11501247 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F1E3913 for ; Tue, 21 Apr 2020 12:47:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FD972076E for ; Tue, 21 Apr 2020 12:47:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728739AbgDUMrL (ORCPT ); Tue, 21 Apr 2020 08:47:11 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:57649 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728524AbgDUMrK (ORCPT ); Tue, 21 Apr 2020 08:47:10 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jQsIp-0002Xh-II; Tue, 21 Apr 2020 12:47:03 +0000 From: Colin King To: Chris Mason , Josef Bacik , David Sterba , Johannes Thumshirn , Qu Wenruo , linux-btrfs@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] btrfs: fix check for memory allocation failure of ret->path Date: Tue, 21 Apr 2020 13:47:03 +0100 Message-Id: <20200421124703.149466-1-colin.king@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Colin Ian King Currently the memory allocation failure check for ret->path is checking that ret is null rather than ret->path. Fix this by checking ret->path instead. Addresses-Coverity: ("Dereference null return") Fixes: bd8bdc532152 ("btrfs: backref: introduce the skeleton of btrfs_backref_iter") Signed-off-by: Colin Ian King Reviewed-by: Qu Wenruo --- fs/btrfs/backref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 60a69f7c0b36..78e6c9a64212 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -2307,7 +2307,7 @@ struct btrfs_backref_iter *btrfs_backref_iter_alloc( return NULL; ret->path = btrfs_alloc_path(); - if (!ret) { + if (!ret->path) { kfree(ret); return NULL; }