From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 198E3C43381 for ; Fri, 22 Mar 2019 11:45:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCBE8218B0 for ; Fri, 22 Mar 2019 11:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255126; bh=MAS38YvAa/JEQ3nzI5XOdbwaCgXDZZiOTd4emUfi1ik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r9+0CYp97f5eU6sGApNiaOQn9pK82J2RPjMMzcibX+JdaIrpJQoxJFd3ZIqBvOWa8 G4VZoudCNVWaT5TeDX3D8au0Z624fuyXG31FE9cAPu1+8NZLO1O6xC4QuxUj8LWFPW NeEVNS8Bh+Sbgmd1XBLb8SSxKEHVd2Iz+70kEqHg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731581AbfCVLpU (ORCPT ); Fri, 22 Mar 2019 07:45:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:48436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731392AbfCVLpT (ORCPT ); Fri, 22 Mar 2019 07:45:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC1252075E; Fri, 22 Mar 2019 11:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255119; bh=MAS38YvAa/JEQ3nzI5XOdbwaCgXDZZiOTd4emUfi1ik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UCveAmXwqIWbE/Ha9zq49YUCkcPrBafRbVbJnTDDE5UyjPSNKwvofmre+mffjwtJl fOXOI5KnWRC0GqPlwYh1rx4iqos15FxCY4OqDWff8+lw6s+N/E7yVMn7rVSBBmAl3u zTSEgw0gUyfJ87NHpM+k15pH73BCe5VfRMaC0HcY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guoqing Jiang , Aditya Pakki , Song Liu Subject: [PATCH 4.9 112/118] md: Fix failed allocation of md_register_thread Date: Fri, 22 Mar 2019 12:16:24 +0100 Message-Id: <20190322111224.203590213@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111215.873964544@linuxfoundation.org> References: <20190322111215.873964544@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aditya Pakki commit e406f12dde1a8375d77ea02d91f313fb1a9c6aec upstream. mddev->sync_thread can be set to NULL on kzalloc failure downstream. The patch checks for such a scenario and frees allocated resources. Committer node: Added similar fix to raid5.c, as suggested by Guoqing. Cc: stable@vger.kernel.org # v3.16+ Acked-by: Guoqing Jiang Signed-off-by: Aditya Pakki Signed-off-by: Song Liu Signed-off-by: Greg Kroah-Hartman --- drivers/md/raid10.c | 2 ++ drivers/md/raid5.c | 2 ++ 2 files changed, 4 insertions(+) --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3798,6 +3798,8 @@ static int raid10_run(struct mddev *mdde set_bit(MD_RECOVERY_RUNNING, &mddev->recovery); mddev->sync_thread = md_register_thread(md_do_sync, mddev, "reshape"); + if (!mddev->sync_thread) + goto out_free_conf; } return 0; --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -6977,6 +6977,8 @@ static int raid5_run(struct mddev *mddev set_bit(MD_RECOVERY_RUNNING, &mddev->recovery); mddev->sync_thread = md_register_thread(md_do_sync, mddev, "reshape"); + if (!mddev->sync_thread) + goto abort; } /* Ok, everything is just fine now */