From patchwork Mon Dec 2 10:03:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180572 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982602ile; Mon, 2 Dec 2019 02:04:08 -0800 (PST) X-Google-Smtp-Source: APXvYqwFK6LPX5Vzb/EOdPjWjlZREtAvihJp7WdchyuVJ8T8v8BhfazqBuyF7pWWNCscTrA/PYRY X-Received: by 2002:a17:906:7212:: with SMTP id m18mr1319499ejk.98.1575281048242; Mon, 02 Dec 2019 02:04:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281048; cv=none; d=google.com; s=arc-20160816; b=W8hMz8BYxSgRpALdy06mbtwm0QxIZyErUCAoVR9yXPAJDdsttiyOHhh98dlr+hlzrR V5DlWoDGjiK2/pRjR30hnyV2fztbtYHtuo3nlRPyeNILNAP217vsSbDfLjemyBa39dWE AWRgBZAMiI0GesfY7ShD5egNP/yYVYghQ2HaPhMUAdPHUX7J+liuNEWTsc1rNclvPlZP 7OOGJ17v0mZa/FxCEvFEUUe4O3F2ivJPP0Ka/tq5Wuc26IP1BztTq1JgqXzGJUkVXd0M mdHMuazk/+Ga9RqO3QmQTikWzEpSu3ZkFw8bek2vzKYfFdz6TfRf2HPMn8cNMDcWZ674 cp0A== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uGmSZAgZbIPTFW/8TzESt4bSkErTu3s+CBvxeawC76U=; b=Up+lebGziNzmk+tbXq0SUyEG6UqiOD/bu6/7HVFWg1A5RR2x+Nr+VYczyCEnYjJ+Xx tdNeRJ0ZBXYQJrVt6j8YWxOeDx8cOJGW0dNnJACrzDDPrUAsPcdRYnzl9NDweOcdwRiA XWrwCVteg1Fx7FVAugWUMx6bG12U3a8JofuBISdaseUyK5qCO5Whzcy0Y6kZvsR2lZGw d/vbk32a9hH3BbSExO3dJVYUq8y2uUpjuRY0sqMzez74l/prXVcf7Blg7B+7dshbkzFr HsOcGa6KwA1r6h8cXz2ZiluxZy80MJ2pvvcimcKjgDLvpzKP/5ERIGlRoiJUbFEOT2Bj J0LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qZQhHd96; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p21si21018960ejz.196.2019.12.02.02.04.08; Mon, 02 Dec 2019 02:04:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org header.s=google header.b=qZQhHd96; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727358AbfLBKEF (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:05 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40991 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727312AbfLBKEF (ORCPT ); Mon, 2 Dec 2019 05:04:05 -0500 Received: by mail-wr1-f68.google.com with SMTP id b18so43406601wrj.8 for ; Mon, 02 Dec 2019 02:04:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uGmSZAgZbIPTFW/8TzESt4bSkErTu3s+CBvxeawC76U=; b=qZQhHd96YfEe19rtRg6iNa++tihwY8CHECx4KbrjLJlEmqMJhBSn4SpuI9n8+WoaQx gDANsHELWRcQqS8tPF25suuZ6Ez+ih9SxwuGo+J21SGyfG01L01wm9fzdkYUyVjteXgU ANO5am48bCZMyy33fU+ye6z/DmcApTUzgqFmd2TrodfW3N5Xy8XnEZDOJro4Ox3vTADz 2QMhGvCdaqiWXI8VZNWqmhhW5LPzjvF2usv13rPmmnPgj74uuXnAOQfDxVb0MIWk7Eep ZFSd/fed2Tud029RnxK8KSb/6lKY6pkwjS0FceK/4d3eN5tSos/hvNV74KAUVDxiJ+Cc xhCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uGmSZAgZbIPTFW/8TzESt4bSkErTu3s+CBvxeawC76U=; b=F45wc7VNPrGBHe/SJO6hCiAuNzuWbY6p1bqS5EdqjVAxMC+XY0jG1xe/q6c0cDDfmO sPxUb5VldMmNpX4bcDnjzr4Abj8IfxUviXdcHh050uI2/xCdmUVBsYKim2kBYTxJUXA2 TEpcMLPx2vURNyYYFJ0Prt6WQFApCsGSqiRAf4Dt27BVE9ZaAzhSxkfB/pRbwP8GXGOb gWe9lEGhXhxs6ZsGwsWj0ahn8DRhaNo9KG7rPc+YzYXApxKUUCpOHqwYK9qeBTB0Hcqw Ttbi1UBGaX3fK6Wv4W030QGT+MOXEjaegHu2k9XskO10kz6LHgwGVvJte9nKVXTousll +VEQ== X-Gm-Message-State: APjAAAVVAu1lSDRSZI4ZGYIHzmqeNRMTRGqFPC5b2mv8KtVsKiPEWM6S iQCxspJan5dJ2IdHglH1+9CcCBwOodI= X-Received: by 2002:adf:fd07:: with SMTP id e7mr16765754wrr.21.1575281042914; Mon, 02 Dec 2019 02:04:02 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:04:01 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 12/14] mtd: rawnand: atmel: fix possible object reference leak Date: Mon, 2 Dec 2019 10:03:10 +0000 Message-Id: <20191202100312.1397-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wen Yang [ Upstream commit a12085d13997ed15f745f33a0e01002541160179 ] of_find_device_by_node() takes a reference to the struct device when it finds a match via get_device, there is no need to call get_device() twice. We also should make sure to drop the reference to the device taken by of_find_device_by_node() on driver unbind. Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver") Signed-off-by: Wen Yang Suggested-by: Boris Brezillon Reviewed-by: Boris Brezillon Reviewed-by: Miquel Raynal Acked-by: Miquel Raynal Cc: Tudor Ambarus Cc: Boris Brezillon Cc: Miquel Raynal Cc: Richard Weinberger Cc: David Woodhouse Cc: Brian Norris Cc: Marek Vasut Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Ludovic Desroches Cc: linux-mtd@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Miquel Raynal Signed-off-by: Lee Jones --- drivers/mtd/nand/atmel/pmecc.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) -- 2.24.0 diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c index 4124bf91bee6..8cd153974e8d 100644 --- a/drivers/mtd/nand/atmel/pmecc.c +++ b/drivers/mtd/nand/atmel/pmecc.c @@ -875,23 +875,32 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev, { struct platform_device *pdev; struct atmel_pmecc *pmecc, **ptr; + int ret; pdev = of_find_device_by_node(np); - if (!pdev || !platform_get_drvdata(pdev)) + if (!pdev) return ERR_PTR(-EPROBE_DEFER); + pmecc = platform_get_drvdata(pdev); + if (!pmecc) { + ret = -EPROBE_DEFER; + goto err_put_device; + } ptr = devres_alloc(devm_atmel_pmecc_put, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); - - get_device(&pdev->dev); - pmecc = platform_get_drvdata(pdev); + if (!ptr) { + ret = -ENOMEM; + goto err_put_device; + } *ptr = pmecc; devres_add(userdev, ptr); return pmecc; + +err_put_device: + put_device(&pdev->dev); + return ERR_PTR(ret); } static const int atmel_pmecc_strengths[] = { 2, 4, 8, 12, 24, 32 };