Received: by 2002:a05:6358:795:b0:dc:4c66:fc3e with SMTP id n21csp2117909rwj; Sun, 30 Oct 2022 11:35:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4CfO11LV1voy4daOipLI7QQ0M2/fYl4ga70qAoVN3dY47qN8MPXBHdw8TTpJXpNGzsZFJ/ X-Received: by 2002:a63:dc4e:0:b0:46e:acf4:7589 with SMTP id f14-20020a63dc4e000000b0046eacf47589mr9263248pgj.170.1667154943838; Sun, 30 Oct 2022 11:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667154943; cv=none; d=google.com; s=arc-20160816; b=lSKXWovmaULpXj5yfdbL+M3OaOfA5fGFvO2sylMyxVwwmeuLoKCyEQ2UOc2opIGci/ Fx/gqdOa7sguh5amnzgF2oDh147yGA3mbBsnUhuqfKbQlSfDQpHKA8mBiuf5oSRFbyuh TmkYnC4mAYxlFnyys9GWU8RCF74F/4MkHK09wESecXwubPtarOUqhWFu8x6Vbz4YExH0 D0tAP2zVvN5O2fnZB+RwzNnUDZcq1fCCC74Tdjp1LlRt8PEzqdy4pAc01HCTxUtXWjZN DB/lQJK10mhp1/iVy9Zd8wamQ9mNGsQ8/KQqmL3wZpU8T0iRoNEJuW3i/ncLhvJhTaE3 tuZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=Ctx2ecB8mk87ajFyjy6myM7ABsa5iflpDws37hICbmU=; b=KvuU6/i5pQ95yI5xNpjBMdBZCaeanhLXyzVQpXw0gOCZbZtgPgx+VIYHqFOJPtsyeC /kBaGIWyfbXbYoeK6w2Jp3y+TUT3hPNY4qq7EFz7CZEfyK3Hvqbh2oYWcEuBfFxtYJ/N AfSryIIGD454Y4HijnfHjzEvTKVTdkmYZwEXVtdTt9zFo2NJnp2CoUhEYyASA+ri5sil qdcqpiJ7bx7Cmwhmv5HRqRsPEVgQE7wPosEj36CHiSjOildXXzRXIbP8XhD0/ZGq8WCg BS38KU8FmtkrgrI20+Cqixgszd4YeP8rNw2xuFy9uTsHnY0mndKDm7EN8v8ilB3B6FTM EAdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=uQmv86US; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y1-20020a62ce01000000b0056782f3bdf1si5510581pfg.19.2022.10.30.11.35.32; Sun, 30 Oct 2022 11:35:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=uQmv86US; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229767AbiJ3ScN (ORCPT + 99 others); Sun, 30 Oct 2022 14:32:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbiJ3ScM (ORCPT ); Sun, 30 Oct 2022 14:32:12 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A70DC626C; Sun, 30 Oct 2022 11:32:10 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4D19733A0B; Sun, 30 Oct 2022 18:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1667154729; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ctx2ecB8mk87ajFyjy6myM7ABsa5iflpDws37hICbmU=; b=uQmv86USpdad9Sm3bF7HJHqa2Y5dt6xoXsYoGiR2iFTVx5ZzD/V8BTW2zzyYQXTlevXSbL NpMabeq3bokOrawR5vu9zvQHrdOxqyPZat+ewJjV+ai+y3/gD/P+nLApLoAqkB1JNnCHS+ WMh8cHmKr+2fR+p5Zv39lofeboQFGBE= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CF61513A37; Sun, 30 Oct 2022 18:32:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id rBHmLyjDXmPXdQAAMHmgww (envelope-from ); Sun, 30 Oct 2022 18:32:08 +0000 Message-ID: <4c92f908-f7e0-30d1-13a0-0230cc99f9ca@suse.com> Date: Sun, 30 Oct 2022 20:32:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: Re: [PATCH] btrfs: Fix a memory allocation failure test To: Christophe JAILLET , Chris Mason , Josef Bacik , David Sterba Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-btrfs@vger.kernel.org References: <34dff6b621770b1f8078ce6c715b61c5908e1ad1.1667115312.git.christophe.jaillet@wanadoo.fr> Content-Language: en-US From: Nikolay Borisov In-Reply-To: <34dff6b621770b1f8078ce6c715b61c5908e1ad1.1667115312.git.christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 30.10.22 г. 9:35 ч., Christophe JAILLET wrote: > 'dip' is tested instead of 'dip->csums'. > Fix it. > > Fixes: 642c5d34da53 ("btrfs: allocate the btrfs_dio_private as part of the iomap dio bio") > Signed-off-by: Christophe JAILLET Reviewed-by: Nikolay Borisov > --- > fs/btrfs/inode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 966cc050cdbb..3bbd2dc6282f 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -8078,7 +8078,7 @@ static void btrfs_submit_direct(const struct iomap_iter *iter, > */ > status = BLK_STS_RESOURCE; > dip->csums = kcalloc(nr_sectors, fs_info->csum_size, GFP_NOFS); > - if (!dip) > + if (!dip->csums) > goto out_err; > > status = btrfs_lookup_bio_sums(inode, dio_bio, dip->csums);