From patchwork Fri Apr 11 16:31:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Tinguely X-Patchwork-Id: 14048537 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 803FB1D86F7 for ; Fri, 11 Apr 2025 16:31:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744389117; cv=fail; b=DNILbr9p+Pe5lXUiaBZxVHO1IgVW9KYuVjTyrWlHJMuPqUaj+enZfRnOCculvAeNgeL91MeRRPcatkVM2iiEEVZATNb1NPg/wDcCXVRRIStDiWBczMCwQpJYVXQ1ctskEqKDpx3qDfq5IypaqH9y/DtnN9Da+C/CuSiTzYGGqJQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744389117; c=relaxed/simple; bh=WRO2FitGXPGCUs9HMeiUrDMImaqWoPefL33KNr1aBpw=; h=Message-ID:Date:Subject:References:To:Cc:From:In-Reply-To: Content-Type:MIME-Version; b=KlJMpjeddARDdZ8IX5iqb5ocKhylfMIgyOS0mkY40mi6oSTxd42QNnBXJp+V9Yg5fbJZhjPRNunvPRx8BBx/9tTonqkrTTz6Yu9/DKC6TLmbPvpkmuDpdG/v36DPLZCByeAtQwvvL8eoQ+qKAg2WucGGZOiBUL+loPX5Muvs73w= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=drPNT0fb; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ZoA0dmQU; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="drPNT0fb"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ZoA0dmQU" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BGC3xX025125; Fri, 11 Apr 2025 16:31:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=so2o7euV2Rg/Mpg35evcYO/2WH+piiN4yTkPgII2vkM=; b= drPNT0fb6kbMaBp2w3nOAb5QaZR7cS2I+q2qLhy/nKyp2sOZIu03lFynqHpR24Lq mzfgqJ8mzE7LdGHrXOFmJKPKh1KrcfLbLMvLdwLcnMs8het4GFaRAPDsi/9yspgI A9GRzVULfn9Us8ItPeQQYxWvY+nWqWIVd3Qi8jCQ1p1AgzEoghC+g8+Il3nP9aAO CCv2DSHtnrqig7rDaF/W6zATN7PQSMpfrNiD612NeGMAhzEKWLLOh/Pp/Cm/isja z9dqFEvhb/QS6YM/NicyRa5+AV9miWPI4FZCYzRAxQEkLYe7okf4qykZBfkWkkOZ 8fSINtcouqY9Q4rAyWGVfA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45y5k4r6kq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 16:31:33 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 53BEr2n6016129; Fri, 11 Apr 2025 16:31:32 GMT Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazlp17012014.outbound.protection.outlook.com [40.93.14.14]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 45ttydvh5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 16:31:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dJOHEmh7yhTjslOXAs8UriERyen+D5Otfg5jJQQYyvkDuQZEDpzUito/2ruYtVvAvX/fIBToaiooQAF5oC3iUKVv91yaRHzw6JjO+JARVh6kvytCrXZLg5Y1eNIrZGCp8u4eCPMBzoTXqvfnruv/ZhNse8JvagGdlsOX5azcKpHPkVTNkZd8H6Y3c6v4qjqIAGrmKG2cRQROxZ1lWRXOrus39UR0Q0UZM2LwsybOkH5hRwD6iJp169THv5zKkGveLubTPiklEPi/u+TsM1pprMGAWkeP5DBDC/BT9U+cIjxyIttjUXZPR3VwG4yLRjtuFQXYm9Uc2tDZWn5MrcFCsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=so2o7euV2Rg/Mpg35evcYO/2WH+piiN4yTkPgII2vkM=; b=TAtGkvxfJaHvVHAbNv2m/7TBG4APAtxSbEWkYiQM1vx5ks3kY9sL431df6oiH5DjXRCOBw9YUIzpqTpPlp87xcSo0y5PiJovUoI44xz6dZVgp2zCFqUedi2dEFGTHXBNU3+DSqH5w6M6nlLCKo8itJC0akSjOJNFrwC1w4RzXuk/pnuulF/8DnGSiAW+aH9qvRbTETsjhodaeJ+4cg08P06lhS77HsMkJTWdazlOKAy3tkOE2e01XzmauKN8i/HFYybZIQTNKyxFUel99foLQ2p6qvPzkkbKNR1nPeKrgC6KNTW6+QpkmmOFLbI8MhD4MS92HmF3gGv+EE8QVOIrdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=so2o7euV2Rg/Mpg35evcYO/2WH+piiN4yTkPgII2vkM=; b=ZoA0dmQUdsCJa1p17yiWguo2zzXlo7iOjwiyHmgNrB28p3wSTOqz1YmRPJddebPOyFOnRKsz5ktltP423DJktBoBJa6TUn+PB+G+1KbAlYMmh2JOR/chEvG/rFeIgFF32LaWYuiKcFeJqkFrCJeE1cEuO80OHw/g4OYwa6LE+50= Received: from DM4PR10MB7476.namprd10.prod.outlook.com (2603:10b6:8:17d::6) by PH7PR10MB5673.namprd10.prod.outlook.com (2603:10b6:510:125::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.32; Fri, 11 Apr 2025 16:31:27 +0000 Received: from DM4PR10MB7476.namprd10.prod.outlook.com ([fe80::f32a:f82b:f6ac:e036]) by DM4PR10MB7476.namprd10.prod.outlook.com ([fe80::f32a:f82b:f6ac:e036%6]) with mapi id 15.20.8606.033; Fri, 11 Apr 2025 16:31:27 +0000 Message-ID: Date: Fri, 11 Apr 2025 11:31:24 -0500 User-Agent: Mozilla Thunderbird Subject: v2 [PATCH] ocfs2: fix panic in failed foilio allocation References: <20250411160213.19322-1-mark.tinguely@oracle.com> Content-Language: en-US To: ocfs2-devel@lists.linux.dev Cc: Mark Tinguely , stable@vger.kernel.org, Changwei Ge , Joel Becker , Junxiao Bi , Mark Fasheh , Matthew Wilcox From: Mark Tinguely In-Reply-To: <20250411160213.19322-1-mark.tinguely@oracle.com> X-Forwarded-Message-Id: <20250411160213.19322-1-mark.tinguely@oracle.com> X-ClientProxiedBy: BN1PR10CA0013.namprd10.prod.outlook.com (2603:10b6:408:e0::18) To DM4PR10MB7476.namprd10.prod.outlook.com (2603:10b6:8:17d::6) Precedence: bulk X-Mailing-List: ocfs2-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR10MB7476:EE_|PH7PR10MB5673:EE_ X-MS-Office365-Filtering-Correlation-Id: dcb4bece-76cd-46d1-1d12-08dd79164e72 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?97kqqdNp/aSeGj3+S9Xr9lOvwOolhR3?= =?utf-8?q?RZ0TJJi3ji7gienxOtz9cKq9V1f80RA9y1r6xXjEZ/PAShgqdlScRoPWmydVMd/MJ?= =?utf-8?q?ejYIQ0dQdBDqYWNBZyuiapvBD3LTWBQn51adNSSUiOEqFR9rXGfQAPptSLwlRCj0O?= =?utf-8?q?4NnZoot/DT7Wm0MabiuGQ701cRuNsMKGZZkYVuMJ0zP+kW2it+iBdzGCztcbHIAFK?= =?utf-8?q?hDrcEoltjwROQ9Jnjt9aNVhejJWuPsqK8UoeJZ28luIl6veocSNDFI81GrwtrSkz7?= =?utf-8?q?1wf+VIsLVQuFiHJA02i4L8xr4/JaEAexCDPDjdkzg5wRTfqwUkOD3u5PJY8zxtt0g?= =?utf-8?q?HIw4OnjI/jFIbHqcOu6gPgIU7JuB6dPpbrp//LTt1jdv5H0s7efRChhDYDOjqruJN?= =?utf-8?q?YymCinqnvlDBnxJOdP2vB+aiDkhcusoRli97icax/Dqvy4qWWBV3UoHkSuMwekW09?= =?utf-8?q?FitJCxrDZfTeJGYa7vkHc4D5gq9hJePJ4RQ+EFhmSIc/pyBaZdJ/gDvm+BVrlaI21?= =?utf-8?q?HiRZeBY5xBSdfZpvrEiRXa85bElAJlYm4r9O0mjLCWvyCImHMjnshZWoEUoNscnqW?= =?utf-8?q?Xg5PKZyATz91zRi7es65HxHSWAmfQMu6zHfztaHbx8082RWNpFdZAYdnZLiRDceyv?= =?utf-8?q?2rKQUwBjijoty8kZAvqLIiUaNMs/vs0cvU7Qxz1YcyGajWue5LqGg+h/q2s1B5wsR?= =?utf-8?q?Uq8cvzfwMQJ8hdqyK1G0zHd+cG0TzvqG71cPdg7ImsFRep8bviEsme7g8xfAeOcts?= =?utf-8?q?rKL/Mw/fMgabmkqozqQGI5k1hKLMJABKyb/5r7393azz09xdgQVNs95N80ZEANyn2?= =?utf-8?q?DXTrMFBA9h1R9kv8H3lHrsAHOLtCZ8tM4clmOYjckQNJd9sS/hSSAbw5HR9srjs91?= =?utf-8?q?bIqYjLGrTvFjwlJ4g8fgqU9huXOqMIhdW+PM0pfCA/DRigJGN91FC+2Vhkx613oQ/?= =?utf-8?q?ExBYY4BCw8CpP4a1RGX6fyu9luEyiBsdqnTiB3gcw/tHRv7TvXmnKA8wA0GYKmSaU?= =?utf-8?q?fF3L26AUdahAQz40pu0KEwyXtJjXn2f5SqFiVgxZyNc0Nxap18BHUuEMvkdPnrSyP?= =?utf-8?q?cue+Oc/w7EuouHztmGDizoFuBHBpXaB/Nqfgj4UJsRDcAq5aqR+o0uMFY48w0de1U?= =?utf-8?q?vTkEYCe9fK/rLrqi3nY7ITcSZnelvjHpaKQ7FDNhVwZQaU2J8vRL8Aa4YZdKZTnXK?= =?utf-8?q?QJ5jeL+CdzO+wWGCLz52NJTmNjkxaBpGj2NKC3KBagowe23m4Iqec2zP8cQJ22Ady?= =?utf-8?q?OOQWt5BFdn5szA2P1XKzXOp838ZMJc6Y3xuL+ivA2Nc6Uium6JEgBGJjmjRsIxWJt?= =?utf-8?q?N+gtcNV70GzFQq/EVokSna5RSyy/JPiFRXmiW24KT4k3C64pq9gvUOU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB7476.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vtsn+DUPfouBf7fYkoW4svzPkrnZ?= =?utf-8?q?Nkt0q08R/ULchSxKcrfrjJEV6EOmutptv/MJJejl6t7PAX3+w8fEgctjpwqN1x+hA?= =?utf-8?q?sL+TRcnz+z8cWe1ok7qHpVOtIAcw5668E51hzNOutpWpkmnEZnekJHDsI4Y6/tp0Y?= =?utf-8?q?sDd+zuFC/wjJY0azuoy5+DUDURmf1Odf1H8izs2PKIIBcrliE4tMMlGwPCh7Z9oyP?= =?utf-8?q?Uv2pvN/my2HyIHdqbd76GpwWhSC9HSkU++udRKM7Nu2mpNJx9b6Cg1lkoKE7BuZvz?= =?utf-8?q?RbJoB9bkRGIRszHhBhIXt5a0nevRXuO3A9HHZ33TmQkn8FD5nCsZlqaZz89kPQQyJ?= =?utf-8?q?UlXDh/51BeYGtgC+HVSRIOlz6KWCu1GucmO5BB4xSe7GUTNDIaYwuzu+WnT7kogbt?= =?utf-8?q?72LrQUEPFFhN6RINDYUCzgDAatndjcwlJQ6eA04/vFCxsz4Z2uVYSyehuIITS6FzX?= =?utf-8?q?f9YPi6Nre9/2Easw5EBNhYxWbWtE5WSs4XT651aOPJ+tSNsEYEvncs08k/QnRM+H/?= =?utf-8?q?IB0fE3nS/P4uU2jvhMM9t0VpkYmolLYEoOYD8Ev4JxA5cVbZYZ0jS3TNdAvthzqKf?= =?utf-8?q?xs4E6st0fAJDtpZKUWOJuPeWLyhIsW6vnRAb6o34Wg2jFywYFclw048pSbPZhHGv8?= =?utf-8?q?r1W2ZiOI4grrebiY90GYnMo7iZSR/iPa3KxBKN+LiXlPzJHN1RUZVw9exQxZRk4PE?= =?utf-8?q?nLZK0g2s6lChVStcEgnjNDvp0edmXYAKqbYfgAHJczFfS39TQOk2vm30KPgYh7cjS?= =?utf-8?q?I9QfYpdSlCztHZWKJm34tExfK9D/twDSUtxdiaCJrr1OgrJZmr2jDcyUQSMNMPOUv?= =?utf-8?q?RZ8/GhzTPMPYnUIfW+Xy8kC0Y6BkH+BjilEDOm25hV6nczzilml3Fu2Rzu/nvbogh?= =?utf-8?q?p0Xr90d9zbJcXOyzwcgcOosufeaDnSBubz6TEG7MpWpjXDBVKU/Hqw49MuVIZ/OOJ?= =?utf-8?q?vjIm6SKQIzAsFFOxiqmIpms84sAXGCJJFu4KqyhBZsgYKvy9dQFdQ95FoACcZEi6O?= =?utf-8?q?fa44hYPpESolfLLdP7bPYFHdQt3of0s5q0nnni6tWzh0XBVsObz0spZK0WP/QLHYm?= =?utf-8?q?VqH9AkeUmwBVFd01sqNkNLp6Ir46LFTDVn7XDeo5uIEXhUwFAZYz/Nt/FRE+2OVj3?= =?utf-8?q?g7F9Qp9hJ3rkzc1aSmuFi05po+LycmERfGVNVYP+31YZb8q2djiyrsvKqf0FF1yPN?= =?utf-8?q?p1DBLmH7hF7aiRl6zHJ8dckPQfOeLAp0vVJgsNSBc+6I0TT9ojfGJk0by7orzg/8+?= =?utf-8?q?tx+UMhrsHEZ5tPLt6ssNcPIxXDpO2WUaNXv3UAh750181ggb4VTzCsw4PrqaWFEkP?= =?utf-8?q?4a2xC/ggNifb+FEOnHO3V5/XpjM5Gr+KTJzarevetuW141iKv0YfLw1GpOVbDIVaC?= =?utf-8?q?0lcUrV8Swz5nFobMxQsCNrSSCv5PmpeazlcG5sEiUSqsQd6qXS+g0jN0JjU+FiWHg?= =?utf-8?q?hWFlvj4EYGxGntNWKiVHNWQkQWoyLtWflJEYNKL4DYI8jYwLW0OI9mVdNhbzsE8rX?= =?utf-8?q?Sn7/HhZvlDnGBlhRdIX4S41M1IhDaaDKaQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GyR1y+TPMvd0thdeH6OfHAJlLWc3UBdR42kOdfiosaQpE8DTi9JgH8HC0Jg1EhwUJAZnpfbboGLXrNyGKgaGK4P432TLbpj+C4+0X/fr/DrH9lkD8CGcEbGyD5S9rLswqXZZZOSHShzHuBBWzfqM6WXsQexZqgtC5t9Z4Kee2c/+vNjhpE8cLHIwfqs9H/+gy6wA655n4dRarw1t42/wWZMfH566IvTRV9bUQzWLemEGSpMVuugCl1YQvbu+0xh7Prx6wmwQgijdMmcldi2nG5GuCONsza6LFMDcRKMEoH+YYF08BWb6PxFStWmmYBcgTvauhhkY1KOPEYiy3aksAAbkVWiNVkAjc37SIVMxlcVKvONLqr+WBcQUzbsBTu5rS5CznwVG7pSNExpxmzxzTQOGu6DmQOyrMPSfkKq1sc/GOVuv34BefL+ooxRkqVIz7aFvPSggXcsSc/6vTxH5tALnNuMgBg1i13TKaLJQzsVgMEbDHnf124XzJsN8mZ/mUGhL093H4Zleac1/QBRU47ki7R/xTiKfAGY+P9dyvx6t/ES7WluFEj4CbNXiG6KAOes0/icv4Y0h0okWzPz42LBkrWnppF1JGzv5lj+5QDA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcb4bece-76cd-46d1-1d12-08dd79164e72 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB7476.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 16:31:27.0481 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kRzAZZAyHfCkeBTfrr/M74FixvYwXsv405bAacKnIdxWt1xNiFgpnKCGyLViDObf8bY5tFDYFeqtjE6aUi7/P649hmAKiNK2VJO8PMZk/EE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5673 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_06,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2504110103 X-Proofpoint-ORIG-GUID: HSBINNohZNZJFFStotMTrcfanFXjyndx X-Proofpoint-GUID: HSBINNohZNZJFFStotMTrcfanFXjyndx In the page to order 0 folio conversion series, the commit 7e119cff9d0a, "ocfs2: convert w_pages to w_folios" and commit 9a5e08652dc4b, "ocfs2: use an array of folios instead of an array of pages", saves -ENOMEM in the folio array upon allocation failure and calls the folio array free code. The folio array free code expects either valid folio pointers or NULL. Finding the -ENOMEM will result in a panic. Fix by NULLing the error folio entry. Signed-off-by: Mark Tinguely Cc: stable@vger.kernel.org Cc: Changwei Ge Cc: Joel Becker Cc: Junxiao Bi Cc: Mark Fasheh Cc: Matthew Wilcox Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Joseph Qi --- v2: sorry, ocfs2_grab_folios() needs the same change. the other callers do not need the change. --- fs/ocfs2/alloc.c | 1 + fs/ocfs2/aops.c | 1 + 2 files changed, 2 insertions(+) } diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index b8ac85b548c7..821cb7874685 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -6918,6 +6918,7 @@ static int ocfs2_grab_folios(struct inode *inode, loff_t start, loff_t end, if (IS_ERR(folios[numfolios])) { ret = PTR_ERR(folios[numfolios]); mlog_errno(ret); + folios[numfolios] = NULL; goto out; } diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 40b6bce12951..89aadc6cdd87 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1071,6 +1071,7 @@ static int ocfs2_grab_folios_for_write(struct address_space *mapping, if (IS_ERR(wc->w_folios[i])) { ret = PTR_ERR(wc->w_folios[i]); mlog_errno(ret); + wc->w_folios[i] = NULL; goto out; }