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=ham 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 99A8CC43381 for ; Fri, 22 Mar 2019 12:22:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D2D221900 for ; Fri, 22 Mar 2019 12:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257354; bh=7r9/PIJRfTwcor3ZEeObDC50je3U/Wvjamj7+E2J0Ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zC6Gn6HQHwy/2zEw0xOitO/y27H0bgOnqBRuf3bvJGKlZAms/28ceiH3rmhEQBN5H zjwQsI5rgXprO2iuG2LNDGu7UipinySgTDKyJLOH2ZmI6IUZOeomflqzZOsxrasvWf 1dBAWTb2jw4/1+e9Ljl+FwGguoO8uKMpGnYkj4Nc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391017AbfCVMWd (ORCPT ); Fri, 22 Mar 2019 08:22:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:33626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390679AbfCVMWa (ORCPT ); Fri, 22 Mar 2019 08:22:30 -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 351DF218A1; Fri, 22 Mar 2019 12:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257349; bh=7r9/PIJRfTwcor3ZEeObDC50je3U/Wvjamj7+E2J0Ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nkxn1N4mRuQ6uAhQC7LPbVzfBr21ivdozg21Iq+SqF2Gc+S5h5k3klOVJaGcGHDCV gh7Q0HaBHG0Ec8n8W3NMQ2mnBUgQbu/Mp9knELZ2Im3cG6JdQdN2t5DUxSp1ZUja80 fzXsi4f+4FtNm+A4Tkl7Qc2Fi2ts6ssf0ehF/Q9I= 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 5.0 206/238] md: Fix failed allocation of md_register_thread Date: Fri, 22 Mar 2019 12:17:05 +0100 Message-Id: <20190322111310.387455796@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-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 @@ -3939,6 +3939,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 @@ -7402,6 +7402,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 */