Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp113832ybz; Tue, 21 Apr 2020 05:50:28 -0700 (PDT) X-Google-Smtp-Source: APiQypICteIzhVoEup++MbpiTd/lfCZE+N0EMpzjHZO7bV364RDB4IKbLKIFQ2bMtb3BN0RZFcCG X-Received: by 2002:a50:8e4b:: with SMTP id 11mr18222505edx.329.1587473428738; Tue, 21 Apr 2020 05:50:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587473428; cv=none; d=google.com; s=arc-20160816; b=E/w8S/gMzE6gsnqKjM6ToYlQcqnSj2TBa+KsnCt4fIVK9r7uZRs9WJNLjEN7YNoUlC 3plBt5uog71DH1Wc+rnx/4tZvC3Eh3YDhs6pKNEgKOCcEZrb+iKLSE05/qzOVd/+Qd+5 4Yb4pF3GXT661i1Z/g0vQJIYxDKOSAsHSOOCpBDOPRwqEj2q9pP4rLIp6dNiLJTXFysg UTF7SwdPodr7D6NF0+mYBGITJwkKaqisZgUN1sZbg4XqsYeTkl3nJf351D1cF6FhxPOL BiNob4GJcxotM830N4JjIEhuDHBnljmqayoOUvQSU/5h63eIBPMs5NsvBU0YwlVmUhIR LGgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=K2PbaankQw4u1XWqym4IEr5QB9nCK+7cU4ocn/gyHzk=; b=BlM7LnOm2196hsD8apeAKTBeTe2uIgu/DIjTeKuonkwxgGqQsauc0smd07DsoO7Y7X pCcpfnK4tVqozFbvvD1xOCrR+ev3Webm/TL+E7BJIh5kJrXCTYVmqrt+QHKCb+vDHjZR NQmsXWrdFWrOgTfFY9M4NIbkihYD8+cRSO/zjMD5Y+HlfwlQSlaD+DuDczM4sjfYaV8v tVui+2mWjyM9nE44q3fz8yjtcSGOV8Jz/0pKwa3lduPEdGAQc+yOzE44JDpHLAXuyeuA JExn/siAWmgZCAdcuFJq0ShMmsoLQKIt24YhXIeq8ltVdGGGo9C4RT8VxE+CkS0YawOP +MYg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w21si1350119edt.595.2020.04.21.05.50.06; Tue, 21 Apr 2020 05:50:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728769AbgDUMrL (ORCPT + 99 others); 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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; } -- 2.25.1