Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp636683img; Fri, 22 Mar 2019 05:38:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8iEdpeY95pcEsL2/JY/68DCGDfMV1rpr4EKrhsEcGrEcRR0fX/OICXESPf4TlMaTukq1o X-Received: by 2002:a65:51c3:: with SMTP id i3mr8578543pgq.45.1553258311139; Fri, 22 Mar 2019 05:38:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553258311; cv=none; d=google.com; s=arc-20160816; b=xlt+PkeqAETzbKnPWSvHX5nHDoMFqHio/+AoH0ZWyaye3FardHao5F5XMfUsDO0TPU 0OutCJ6rnk0oX4ilhtu40LqmuegU3QYY6Dvgx+KmjXzsu4f6VTiCLNkyaW3aJWkXxkwO 30KPSMPyIsmUjXylBsttpSNf6caI+tO9vFLjvbb+/ESjIsO/OjWI0OOAyA/rHeX85Xdh c4J7CY2p3QYHwuzBls3V/8ENLsEs1SEuyZwEGYQ9p42FITcDNDGiNl/IMUJPQEFxa49m RZTzpFjb9vwHj/RUKgwapgaQ7zMFQ7JE6/YPboLrgQ8Rca1Iu4ZzS9W+F4vnCTeTwrIE bhkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sd6xcFrmd2TjCM3v5FdtYrJGZ8foinn3+ALVJKmC27g=; b=xSP6LCgzMHYLR9YHvNNzt4H3m6R9adwOBntaIVRy3GIfPb453Huztoi8chsRpdkEWh QVC+nCQ+PQIGFqHvOlW+nMbo58XhjpNB5641Z7acDt3JYmTzYHJOXeJRqb1pD1sJhVz0 tNGyCJvM9CY7iJsV9DbOj8YOwaKxLPbZXu6FZDvJfDAtgUqTorZgchtseqEBFp2m/1QQ dDvsV7PsNJDpwV4ylpWjNGbuqiVTunnP0pHe+Qy7Gec7c6AsbmSrP8TXrRoytpAV30oV rtubkcv87I2wdDLWnhEZHYInT3ke1Dg9iYp7LO33L8FVpxA2Td+r0WxeWowGtXcOE1vG gVug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P5kf7aIY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 94si7044742plc.298.2019.03.22.05.38.13; Fri, 22 Mar 2019 05:38:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P5kf7aIY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389537AbfCVMhh (ORCPT + 99 others); Fri, 22 Mar 2019 08:37:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:48382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388925AbfCVMJy (ORCPT ); Fri, 22 Mar 2019 08:09:54 -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 B82592082C; Fri, 22 Mar 2019 12:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256593; bh=ZlB3zUqyvBi2alKM3r/oR3hZ+X8/Aoq65a03H2JBCe0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5kf7aIYoEH/eElaHV7pm6oznbDeXEyk5pYFIDQWxVlyyJ6AjRKvqAHuIMGiNgJMe 7jmcVC5OZu2EpKPrAPoOZ5Arl8MUu0b/h7hc2kNZAkBf7rmwyRy86R5UA/Mq3CsVXF HEductnohrPmSxJDbUnwgmkFGViSwdeRfPV+aK44= 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.19 259/280] md: Fix failed allocation of md_register_thread Date: Fri, 22 Mar 2019 12:16:52 +0100 Message-Id: <20190322111343.635615816@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@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 4.19-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 @@ -3959,6 +3959,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 @@ -7390,6 +7390,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 */