From patchwork Mon Dec 2 10:30:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180600 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5012364ile; Mon, 2 Dec 2019 02:31:24 -0800 (PST) X-Google-Smtp-Source: APXvYqxl8x/Z3nE2tFokkA8zGh+8CqBTN9ZDHVrSndp7WnamYVK3akHZ9l8irtXLPeUFC/+ELpj8 X-Received: by 2002:a17:906:1354:: with SMTP id x20mr30644053ejb.279.1575282684248; Mon, 02 Dec 2019 02:31:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282684; cv=none; d=google.com; s=arc-20160816; b=Zj8ZIfXng/NrAq6CkcL+WSxHyiwQCZSjtj5E23Mwm1oW0DHcLg1jwQhTHFP9m5At7i yzAnp3i7ncC9AlxxCkomNm9XSqxf8aWAgPmKPd5yjH/dpdkl3QZx1id22aOMjT2seZy/ jKAEUWkrdgYBLe5PUtxKMpoNhpaHzpCeNnHWyAmwu0ia8XNPDjHPvzs32npbN6eX3gKN H5GE0pdyu7sV3nYDBU1LqTMhjwBQvDcqXO+By/VmKVMiVcpl1eHMMd127X9fDe5ZisVR kWfcayyGm1S/xOPO0V0i6IoKmTFd+HBbACLvjfXfRwgCL0dER3A0Wt5P3P0g+Ork4BwA /H/w== 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=SLTAktNqJAQh6GulSxLAW//F9vtP2hMwMcX3jpbTse4=; b=fPTcd0f7VCZdXG4Pvd+8GeFDFJVE0cYFJG470JDGGP088UtVzwjEa0sgy48kZ+20l9 t069hefeJVKv/46e6jUE9pGjzkgE6MR6mz0a3z+1u6tp6GVwjjNyPKHiWGeon+EtCd2H whGeVJ++sm8CaI5GoYGGhjQd3UDLAVrqmouOX/pjFvOJ9mcMMPkz9QoJrRVO5FkeuzD1 QtAFWQxhelZxDY5zPvgA3hjuHe1XOmsXWVPXExczO7lfWV/DizwIH8VpKmNQGK78N4cf 8TwXnMHp92kM1zXJUeAV13dGBMsGBJyceYPePPaAb21ExFuwYl7qaphvLlu6I0ZSe8tA eXpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UkZbcSi6; 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 e21si4015152edq.191.2019.12.02.02.31.24; Mon, 02 Dec 2019 02:31:24 -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=UkZbcSi6; 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 S1727388AbfLBKbX (ORCPT + 15 others); Mon, 2 Dec 2019 05:31:23 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41766 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727575AbfLBKbX (ORCPT ); Mon, 2 Dec 2019 05:31:23 -0500 Received: by mail-wr1-f65.google.com with SMTP id b18so43525198wrj.8 for ; Mon, 02 Dec 2019 02:31:22 -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=SLTAktNqJAQh6GulSxLAW//F9vtP2hMwMcX3jpbTse4=; b=UkZbcSi6Lcdqyraq6F9a5xkKfpr+sLTLgB7Nnfe70/RU73xqNCwJk1vIbls2U/g9Od Wtcf/U67Li7ibBpteEfopiR5ASjR0VT31jdwyRUBqrewZLDAvVufgwRHn8SWUBobnyIM 46qNA/Mx8MzLFrvGoFKXvhvUBAI95u1FcAD/7FOHRrxkEySY/lsNJnXZ3lgeoq+TD6qP sJwwPDdhT7xldJN7p7+uL/zTlARWW9gPkhI1coaOSJkEP8gAa4ZrbppDWQe2ODIDvjeG SwXdIzfXzwyXMUB8eK7+e/a/QuqK0pw281kOm6/bj88B2FIJYuD5TORerXD6cNd6JckC h94A== 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=SLTAktNqJAQh6GulSxLAW//F9vtP2hMwMcX3jpbTse4=; b=mcfhwbtuWiVhjxpEiWE5l930hET/ogURQE+Wj/dzzw+8Icdbt6xop8al++XIlBCcIq dEgEJkjH0RChEEM1Xsrf3Y2P6f7IZP7ji/rm95pvcnStc4duH2yMc+kMt6JL2WQgVg4A 2uag038XpZ76Re908mxxEu0oJavuwzN7FyuWpifjCQlXQmf3qZipYeITztkOjrLu5mix Mq/NJ7YXlAZEDC/vv9OI5flKDwd8oCwbCeod3ago/e8xsBOGfXqPyhjZ+LNIPuxO8pJm KLLU0LJcvhB0X7NJpkKnRTdTXCSzYoy2r45j6zKumWrf/j389ndfQV9zPFEzpFeIoCz4 s79A== X-Gm-Message-State: APjAAAVKvTclF+ws+dEKiZ1uOOMQ6St+pXuQiVZYYJbBw3ZAdRe67MHQ +w1suugjhnmEsoTtFlDgRDCdBB5GYNY= X-Received: by 2002:a5d:4dc9:: with SMTP id f9mr17191227wru.297.1575282681360; Mon, 02 Dec 2019 02:31:21 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id r6sm26402860wrq.92.2019.12.02.02.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:31:20 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 13/15] mtd: rawnand: atmel: fix possible object reference leak Date: Mon, 2 Dec 2019 10:30:48 +0000 Message-Id: <20191202103050.2668-13-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202103050.2668-1-lee.jones@linaro.org> References: <20191202103050.2668-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/raw/atmel/pmecc.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) -- 2.24.0 diff --git a/drivers/mtd/nand/raw/atmel/pmecc.c b/drivers/mtd/nand/raw/atmel/pmecc.c index 555a74e15269..9d3997840889 100644 --- a/drivers/mtd/nand/raw/atmel/pmecc.c +++ b/drivers/mtd/nand/raw/atmel/pmecc.c @@ -876,23 +876,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 };