From patchwork Tue Jun 23 19:50:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191533 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2289251ile; Tue, 23 Jun 2020 13:02:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlA6o4gcKGTGQK3EM6sTlrkdku86SDFhT3ldZ09RsvrKASwwgiOQVuo6oj9fglgpYdLbOv X-Received: by 2002:a17:906:c142:: with SMTP id dp2mr22636497ejc.541.1592942545361; Tue, 23 Jun 2020 13:02:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942545; cv=none; d=google.com; s=arc-20160816; b=t29rTToLJLIote6uXbfbu8GsHaOC4rlxEEJOFl/xhbUD++2DmHRyGn6px91Zsd4S59 uQimfZZ/8qrBBzitQYEBRs7PbvPWOvQtuL2++3YEpeI7bmb7il5/grdTy5SGTHYVoNaM kVhYzOKICw/1DHzmqEh1Q4/eXObqdwpXnd35IVNuTuw9ODeCe+pxLlpYkN7vKEJ+0hUM CLZy2rigjE2LnPWJemjIR0H13gy6dUgzCowoZ1tdP2CJmOGPVib8rQtvEhFpalrAAET/ FTUVY3OHJM/LU/2XvRehjhriFIyk1T9UVOXeLGMn7e1Jg2pSpmTL2/96ChiAeHPITaRB tJBw== 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=7kHrDaX/4uKHm1y2Kt7f2WLW1aM9GAkupAarp/Nwk20=; b=se4N6DlOeSJxkW0D6voJacwTK2i1ta8x4MjKTkkkgpTwQNa6c1tp9BcpmMC0HTmPNl wdI3X9+UD/jK6el435iRkco5299MTOLTpLvAbtST/tSdklzs7SjgKWe/opBFNncFBd95 gr/XA1JlcJg4jTgEf+v7wYZesjifZc/d0EFn/tLrNbMkMEfjoXDfMyCQ2fDtQbgEPrC4 xXQ0kVe0IQJvJ/Q8LMFD9k5h0uY/fS9VbDXUF6QeMjxVGTIZoRGJnQWAn8s6+PcyPxEs toqwTnNZpFiwh5zou4VSIdS2BO3+5ljFFdkYdaYd0EEaVcQ1eOkbBkXXp9MAanH+Msfs xLEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J5vKB30J; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b23si3777014ejb.465.2020.06.23.13.02.25; Tue, 23 Jun 2020 13:02:25 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J5vKB30J; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387830AbgFWUCY (ORCPT + 15 others); Tue, 23 Jun 2020 16:02:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:39590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387826AbgFWUCX (ORCPT ); Tue, 23 Jun 2020 16:02:23 -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 6570120CC7; Tue, 23 Jun 2020 20:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942542; bh=8sH1BuaxQA9HIDu/u76BZAglO65lE0+81cOQv5ttZ5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J5vKB30JVYeBpNWtM8omEMXeI8ALY6kFbBN4ECnKkTnCEXi6PRwJdeMsMFM5UcxY8 nxC7SKb1jsnq7bIcyuEpJMRUJ5NIj7bv5F65MXVturLIr84f8SoIFM4iX5JYvA1uXn s+PwKOz0yTTVYS9iVQmiNwhKKLG1kjRInbvIq5S0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , Mathieu Poirier , Suman Anna , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.7 009/477] remoteproc: Fix IDR initialisation in rproc_alloc() Date: Tue, 23 Jun 2020 21:50:06 +0200 Message-Id: <20200623195408.032057787@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit 6442df49400b466431979e7634849a464a5f1861 ] If ida_simple_get() returns an error when called in rproc_alloc(), put_device() is called to clean things up. By this time the rproc device type has been assigned, with rproc_type_release() as the release function. The first thing rproc_type_release() does is call: idr_destroy(&rproc->notifyids); But at the time the ida_simple_get() call is made, the notifyids field in the remoteproc structure has not been initialized. I'm not actually sure this case causes an observable problem, but it's incorrect. Fix this by initializing the notifyids field before calling ida_simple_get() in rproc_alloc(). Fixes: b5ab5e24e960 ("remoteproc: maintain a generic child device for each rproc") Signed-off-by: Alex Elder Reviewed-by: Mathieu Poirier Reviewed-by: Suman Anna Reviewed-by: Bjorn Andersson Link: https://lore.kernel.org/r/20200415204858.2448-2-mathieu.poirier@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/remoteproc_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index be15aace9b3c8..8f79cfd2e4678 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2053,6 +2053,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, rproc->dev.type = &rproc_type; rproc->dev.class = &rproc_class; rproc->dev.driver_data = rproc; + idr_init(&rproc->notifyids); /* Assign a unique device index and name */ rproc->index = ida_simple_get(&rproc_dev_index, 0, 0, GFP_KERNEL); @@ -2078,8 +2079,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, mutex_init(&rproc->lock); - idr_init(&rproc->notifyids); - INIT_LIST_HEAD(&rproc->carveouts); INIT_LIST_HEAD(&rproc->mappings); INIT_LIST_HEAD(&rproc->traces);