From patchwork Tue Jun 23 19:57:43 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: 191577 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1348986ecs; Tue, 23 Jun 2020 13:55:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzffkoiCQW81FlTkZUUXE9scE7th5aoXnrMlDS3kZMuOtb8X29FXNOINq08fgnFpWbmnHt/ X-Received: by 2002:a17:906:4f94:: with SMTP id o20mr21329013eju.113.1592945737395; Tue, 23 Jun 2020 13:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592945737; cv=none; d=google.com; s=arc-20160816; b=L/qFTCUjWoYm2svAMQZf4Xz0mHrDFdw04tsU4LOltwxpU//zxQPK4jzdMDX3B5WF9V xEiGKPLzy3bax0ikcb6241es+XY3Zp6ZhrmvqqOQ8ONmAjp/Cy9ua8NisFkWFhANFiz6 gvyOtAkOG9zer8rXI30YD725erWua4WQnTpiF2pg/wdFjEH4rGKsulPRWGkYmeaOI3WY 9kbE8Wkq3a7mI4K9vuNAswDJCLQDgpvsrB00cplmBcvSmOsnisgYJsuw1Re3+XCH5dQO HXU3Nc5x8GhZwSuX0mU0B2geKbSew7A6RWeXe5RlEcD8Lbpc8JwHoBRA0y3jnWu8WXN+ 3vOA== 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=PmW8DKRX9NdC6WyXo0MxoVoYlDwWMjCFbkNw3NFVXcE=; b=CdXHgP+CmKZ9TU+ynd+XeNpt8ErD8us68bCQ/jQNe5xQBHGAnSyVKHy8XzWmhAYPVR eBQvbuU7AKVjc3OFhbDKQ2tQEf/2LvKYSOI8N/UQOk1d+QQoUqveL6xoANRciJQokKUL uUv/zfWtxeWl7LhK4h+uz2P/OlNsnHSU2SdfW1Xc/Z6O+0zJQta8dcpu6chEjkTBabGN VufHsANbNDfO/ofJUhixl9SggwMn6DCiBzA4jOeljYtWfEEQQMd3N3yv7ztJmhD26mHy RCxVTAzo1aqGYKjTbJ8XlGqHOYHmtu65bchlIFos6zK7anMPCbuxZj9QnJ0uHq+komBJ FodQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f1cHMmZW; 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 h2si11337865ejp.405.2020.06.23.13.55.37; Tue, 23 Jun 2020 13:55:37 -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=f1cHMmZW; 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 S2391610AbgFWUoy (ORCPT + 15 others); Tue, 23 Jun 2020 16:44:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:42136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392615AbgFWUot (ORCPT ); Tue, 23 Jun 2020 16:44:49 -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 B38E621927; Tue, 23 Jun 2020 20:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945090; bh=/IpTzBkDfJ4lupPf7oD6qJgqnHI+D4xLBUJjRnYvZJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f1cHMmZWdATTOTe0NwpwZpNrFSWmDvCkfTpHJJ9b7lh8z0CRTRay48O9fKDkalySU 4kIuDXRoE67XI0nQ+hWnLRSxIpOrMgHt2QiBSo0TJyxCk07X9qGxaOIN5HZ7MQWTZJ ethJdOVNCe/qe1qGJT8e8jOtiwJ81LPVkAbN3dp0= 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 4.14 007/136] remoteproc: Fix IDR initialisation in rproc_alloc() Date: Tue, 23 Jun 2020 21:57:43 +0200 Message-Id: <20200623195303.982139803@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@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 8f4fa1a52f057..d6372470e5bea 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1432,6 +1432,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); @@ -1450,8 +1451,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);