From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53DFCC4332F for ; Tue, 31 Oct 2023 09:23:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343850AbjJaJXY (ORCPT ); Tue, 31 Oct 2023 05:23:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343851AbjJaJXY (ORCPT ); Tue, 31 Oct 2023 05:23:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E26CFF4 for ; Tue, 31 Oct 2023 02:23:20 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FA54C433CD; Tue, 31 Oct 2023 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698744200; bh=kvH5sHoI5uzN3/kWZXMRUVXYcwwPOmuibK022qlmkw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rl+2o/434iAdS63RvmoVMX+Frwzl3Eve8hRjxrU/R/jilhN6yA8R/evf5kjQ6/lwi J2OMYXAd97szyaqLswPSNWKCu0lil4enADBI9+qXUh5V4mA1H2t5OeEKzuoznYYR2N rUUOJm1q2K2wWPYMViDSqkR5H9kUTCvy1kwvUoULIJAMRMUfnzEKJb6PJhuv9RpY9e lURDIX901Uc8x7kaqOM3wejaMGoDutx+hX26VHwYTNOD30IpUY0t9wruIeoiluLbgi rBjQPzX8yDTpZVHOsfTKvXLVjyV1/UbyEsj+EiYilEki4dCzutjENQkqaFQT12H2/G uvmJSDPrfEovg== From: Lee Jones To: lee@kernel.org Cc: stable@vger.kernel.org, Krzysztof Kozlowski , Bjorn Andersson , Greg Kroah-Hartman Subject: [PATCH v5.10.y 3/6] rpmsg: Fix kfree() of static memory on setting driver_override Date: Tue, 31 Oct 2023 09:22:58 +0000 Message-ID: <20231031092308.2227611-3-lee@kernel.org> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog In-Reply-To: <20231031092308.2227611-1-lee@kernel.org> References: <20231031092308.2227611-1-lee@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Krzysztof Kozlowski commit 42cd402b8fd4672b692400fe5f9eecd55d2794ac upstream. The driver_override field from platform driver should not be initialized from static memory (string literal) because the core later kfree() it, for example when driver_override is set via sysfs. Use dedicated helper to set driver_override properly. Fixes: 950a7388f02b ("rpmsg: Turn name service into a stand alone driver") Fixes: c0cdc19f84a4 ("rpmsg: Driver for user space endpoint interface") Reviewed-by: Bjorn Andersson Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20220419113435.246203-13-krzysztof.kozlowski@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Lee Jones Change-Id: I33ae2cbad4c0ab679c340de236fb028b3f87c3dc --- drivers/rpmsg/rpmsg_internal.h | 13 +++++++++++-- include/linux/rpmsg.h | 6 ++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h index 3fc83cd50e98f..9165e3c811be4 100644 --- a/drivers/rpmsg/rpmsg_internal.h +++ b/drivers/rpmsg/rpmsg_internal.h @@ -84,10 +84,19 @@ struct device *rpmsg_find_device(struct device *parent, */ static inline int rpmsg_chrdev_register_device(struct rpmsg_device *rpdev) { + int ret; + strcpy(rpdev->id.name, "rpmsg_chrdev"); - rpdev->driver_override = "rpmsg_chrdev"; + ret = driver_set_override(&rpdev->dev, &rpdev->driver_override, + rpdev->id.name, strlen(rpdev->id.name)); + if (ret) + return ret; + + ret = rpmsg_register_device(rpdev); + if (ret) + kfree(rpdev->driver_override); - return rpmsg_register_device(rpdev); + return ret; } #endif diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index a68972b097b72..6e7690e20dc51 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -41,7 +41,9 @@ struct rpmsg_channel_info { * rpmsg_device - device that belong to the rpmsg bus * @dev: the device struct * @id: device id (used to match between rpmsg drivers and devices) - * @driver_override: driver name to force a match + * @driver_override: driver name to force a match; do not set directly, + * because core frees it; use driver_set_override() to + * set or clear it. * @src: local address * @dst: destination address * @ept: the rpmsg endpoint of this channel @@ -50,7 +52,7 @@ struct rpmsg_channel_info { struct rpmsg_device { struct device dev; struct rpmsg_device_id id; - char *driver_override; + const char *driver_override; u32 src; u32 dst; struct rpmsg_endpoint *ept; -- 2.42.0.820.g83a721a137-goog