Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp197063pxu; Wed, 25 Nov 2020 17:25:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBI7OPWsLngTqebAuM2CQc/HU+SUMx0PUruE7IpiWcDut04PTT3VQKlA7EhnNypT9l0RLn X-Received: by 2002:a17:906:c006:: with SMTP id e6mr610571ejz.374.1606353906775; Wed, 25 Nov 2020 17:25:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606353906; cv=none; d=google.com; s=arc-20160816; b=C/dUXFT7VZefWekinV7KFBRvazL9CNjINVsqa7c9wAI/3Dzsb/WawMcheNPrmshYJA +pGYR7kX/EbY7dsIMckxOQRAKim1TKrSZIYxtY6ZDLjD4jhxWd/mYtRUNTkyrbEeVozn igiIQrszhfhLJ3Z0Cf195IeXBQe0WGJ5EDu/QbC1tr53UW1q2fPAQvSFhUA77RDIqMl5 2ZwFvmhciaDbpdJOK5/qtALIXrAnf6FnHFie6OqYQToB0D7LMmTTjtdIG7R65FUZ9fgG h8xoduY2qS0iOvPzjtQ70Q9hBRj7F/PvKd6iGOq5naHQ3TRAatTMqmpK05ru+cWvJ1eY CG9Q== 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 :mime-version:user-agent:date:message-id:from:references:cc:to :subject; bh=XUjuhC3mfiur3VfE5hyS6EaXd2vTFv74utxuPv9hm1o=; b=NUf5yzs2+ztZA2zch/AAG3ME8sj5m17YRgy6Dmun/LH8cp8XKSyypJP0TAdOD2ybOL kj4ikGdNCI3cJnnXRluBPiEeUXRJAt5yQQwAdxCsjp2vTr5p1HV6ed4+0TF9VWYUDSw1 fKLDQORZJ1/9lquGXeSXCIMBAU7uNg8lXTc1Mw+NCtvD3YcbOKoa9wzYaJsFBZTm6R+F Pp8BWq12IpjEzgMCCJW6c7hNCFngydvYbpdcd1PljD3Kz2P98xeip2TeffuSddIiGj7P B+q1WnHzU1MDwE/n3t6GyOXa1BeSMulnvYGY47Wrc2WlGeuNdR7DJ3CqNERYCAZDW1hL MD7w== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t20si1987150eju.40.2020.11.25.17.24.43; Wed, 25 Nov 2020 17:25:06 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731487AbgKZBVS (ORCPT + 99 others); Wed, 25 Nov 2020 20:21:18 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:8589 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730762AbgKZBVS (ORCPT ); Wed, 25 Nov 2020 20:21:18 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4ChKhH5ZwGzLvWM; Thu, 26 Nov 2020 09:20:47 +0800 (CST) Received: from [10.174.177.149] (10.174.177.149) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Thu, 26 Nov 2020 09:21:11 +0800 Subject: Re: [PATCH] xfs: check the return value of krealloc() in xfs_uuid_mount To: Eric Sandeen , "Darrick J. Wong" , CC: References: <20201125065036.154312-1-miaoqinglang@huawei.com> <365b952c-7fea-3bc2-55ea-3f6b1c9f9142@sandeen.net> From: Qinglang Miao Message-ID: <9f998a9d-0684-6b45-009e-acf2e0ac4c85@huawei.com> Date: Thu, 26 Nov 2020 09:21:11 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <365b952c-7fea-3bc2-55ea-3f6b1c9f9142@sandeen.net> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.149] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2020/11/25 23:55, Eric Sandeen 写道: > On 11/25/20 12:50 AM, Qinglang Miao wrote: >> krealloc() may fail to expand the memory space. > > Even with __GFP_NOFAIL? > > * ``GFP_KERNEL | __GFP_NOFAIL`` - overrides the default allocator behavior > and all allocation requests will loop endlessly until they succeed. > This might be really dangerous especially for larger orders. > >> Add sanity checks to it, >> and WARN() if that really happened. > > As aside, there is no WARN added in this patch for a memory failure. > >> Fixes: 771915c4f688 ("xfs: remove kmem_realloc()") >> Reported-by: Hulk Robot >> Signed-off-by: Qinglang Miao >> --- >> fs/xfs/xfs_mount.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c >> index 150ee5cb8..c07f48c32 100644 >> --- a/fs/xfs/xfs_mount.c >> +++ b/fs/xfs/xfs_mount.c >> @@ -80,9 +80,13 @@ xfs_uuid_mount( >> } >> >> if (hole < 0) { >> - xfs_uuid_table = krealloc(xfs_uuid_table, >> + uuid_t *if_xfs_uuid_table; >> + if_xfs_uuid_table = krealloc(xfs_uuid_table, >> (xfs_uuid_table_size + 1) * sizeof(*xfs_uuid_table), >> GFP_KERNEL | __GFP_NOFAIL); >> + if (!if_xfs_uuid_table) >> + goto out_duplicate; > > And this would emit "Filesystem has duplicate UUID" which is not correct. > > But anyway, the __GFP_NOFAIL in the call makes this all moot AFAICT. > > -Eric Hi Eric, Sorry for neglecting __GFP_NOFAIL symbol, and I would add a WARN in memory failure next time. Thanks for your advice! > >> + xfs_uuid_table = if_xfs_uuid_table; >> hole = xfs_uuid_table_size++; >> } >> xfs_uuid_table[hole] = *uuid; >> > . >