From patchwork Mon Jan 10 17:12:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 12708980 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 4066DC433F5 for ; Mon, 10 Jan 2022 17:12:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238000AbiAJRMi (ORCPT ); Mon, 10 Jan 2022 12:12:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238005AbiAJRMi (ORCPT ); Mon, 10 Jan 2022 12:12:38 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 685A9C061748 for ; Mon, 10 Jan 2022 09:12:38 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so853827pjp.0 for ; Mon, 10 Jan 2022 09:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9jA8Px8+FgcT7aIX3XA5ZrN4ohFuHcfeWW/hxxrzJ+g=; b=nvzssFy+eDK2rFpEJC8UqWppg151PjAeZdRVGZTMavumU8KGiD77DuuZ7R2IjiNMX0 BE1kcPGsbOyaa3FM1amD0K79AvqrDlq0VxlTs+IIzf12Pf64kkWB7bppFt99RYOUp5q8 zL2MDARamDuIuK0Ot7eFzO1hDSnYwnxULFrFY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9jA8Px8+FgcT7aIX3XA5ZrN4ohFuHcfeWW/hxxrzJ+g=; b=PE3t2lcLsJj6wAr53tFE22vs3fbhrIKB2aEHk/9cTZOj3TeX9MsB4aMnUzokZNyLvB 1fw2meQwd89o//sofy12ZaIBt5OYSkMJ6ftyjhYZKCkpcpiIZfuIcVMRPkyWrCR34U/H G0ytqCNAohmQCJEMK6cj9uQh9x7ZW5MD+uqGBwH154p+p7OE8J0o5k0pCfElOTnR+0D9 kcf49IMxQEdud0Qzrys1EmHkGbShtUKQl8C/b6Pmxop57wEreUQ+l7bAgPhIQg0tfMF+ ZZyB/pImh4IWyU7HlolrDs6hliSCJXVDrfTNrftz7gHjQsVSUFlEmPf3+1NCetCWhnb6 0zaA== X-Gm-Message-State: AOAM532M3gJYx4cjIcH01DYkzFoNPpXpgfRN5jz71VhnNHEaIiDp/Oyc JCA6Vl6hyNzkMZYnc+TBzSBPow== X-Google-Smtp-Source: ABdhPJx23kj74PvSVsyQOhtMoDCsJNIphShlnl0hawVjf58PIr3hyy1M9sCpr9Ogbwj8CmRAKInd4w== X-Received: by 2002:a17:903:2486:b0:149:1ce1:d45d with SMTP id p6-20020a170903248600b001491ce1d45dmr556472plw.57.1641834757845; Mon, 10 Jan 2022 09:12:37 -0800 (PST) Received: from localhost ([2620:15c:202:201:470e:3451:3aa4:4b43]) by smtp.gmail.com with UTF8SMTPSA id p18sm4890635pfq.174.2022.01.10.09.12.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jan 2022 09:12:37 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Ohad Ben-Cohen Cc: linux-kernel@vger.kernel.org, Sibi Sankar , Bjorn Andersson , Sujit Kautkar , Stephen Boyd , linux-remoteproc@vger.kernel.org, Matthias Kaehlcke , Mathieu Poirier Subject: [PATCH v5 1/2] rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev Date: Mon, 10 Jan 2022 09:12:31 -0800 Message-Id: <20220110091228.v5.1.Iaac908f3e3149a89190ce006ba166e2d3fd247a3@changeid> X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Sujit Kautkar struct rpmsg_ctrldev contains a struct cdev. The current code frees the rpmsg_ctrldev struct in rpmsg_ctrldev_release_device(), but the cdev is a managed object, therefore its release is not predictable and the rpmsg_ctrldev could be freed before the cdev is entirely released, as in the backtrace below. [ 93.625603] ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x7c [ 93.636115] WARNING: CPU: 0 PID: 12 at lib/debugobjects.c:488 debug_print_object+0x13c/0x1b0 [ 93.644799] Modules linked in: veth xt_cgroup xt_MASQUERADE rfcomm algif_hash algif_skcipher af_alg uinput ip6table_nat fuse uvcvideo videobuf2_vmalloc venus_enc venus_dec videobuf2_dma_contig hci_uart btandroid btqca snd_soc_rt5682_i2c bluetooth qcom_spmi_temp_alarm snd_soc_rt5682v [ 93.715175] CPU: 0 PID: 12 Comm: kworker/0:1 Tainted: G B 5.4.163-lockdep #26 [ 93.723855] Hardware name: Google Lazor (rev3 - 8) with LTE (DT) [ 93.730055] Workqueue: events kobject_delayed_cleanup [ 93.735271] pstate: 60c00009 (nZCv daif +PAN +UAO) [ 93.740216] pc : debug_print_object+0x13c/0x1b0 [ 93.744890] lr : debug_print_object+0x13c/0x1b0 [ 93.749555] sp : ffffffacf5bc7940 [ 93.752978] x29: ffffffacf5bc7940 x28: dfffffd000000000 [ 93.758448] x27: ffffffacdb11a800 x26: dfffffd000000000 [ 93.763916] x25: ffffffd0734f856c x24: dfffffd000000000 [ 93.769389] x23: 0000000000000000 x22: ffffffd0733c35b0 [ 93.774860] x21: ffffffd0751994a0 x20: ffffffd075ec27c0 [ 93.780338] x19: ffffffd075199100 x18: 00000000000276e0 [ 93.785814] x17: 0000000000000000 x16: dfffffd000000000 [ 93.791291] x15: ffffffffffffffff x14: 6e6968207473696c [ 93.796768] x13: 0000000000000000 x12: ffffffd075e2b000 [ 93.802244] x11: 0000000000000001 x10: 0000000000000000 [ 93.807723] x9 : d13400dff1921900 x8 : d13400dff1921900 [ 93.813200] x7 : 0000000000000000 x6 : 0000000000000000 [ 93.818676] x5 : 0000000000000080 x4 : 0000000000000000 [ 93.824152] x3 : ffffffd0732a0fa4 x2 : 0000000000000001 [ 93.829628] x1 : ffffffacf5bc7580 x0 : 0000000000000061 [ 93.835104] Call trace: [ 93.837644] debug_print_object+0x13c/0x1b0 [ 93.841963] __debug_check_no_obj_freed+0x25c/0x3c0 [ 93.846987] debug_check_no_obj_freed+0x18/0x20 [ 93.851669] slab_free_freelist_hook+0xbc/0x1e4 [ 93.856346] kfree+0xfc/0x2f4 [ 93.859416] rpmsg_ctrldev_release_device+0x78/0xb8 [ 93.864445] device_release+0x84/0x168 [ 93.868310] kobject_cleanup+0x12c/0x298 [ 93.872356] kobject_delayed_cleanup+0x10/0x18 [ 93.876948] process_one_work+0x578/0x92c [ 93.881086] worker_thread+0x804/0xcf8 [ 93.884963] kthread+0x2a8/0x314 [ 93.888303] ret_from_fork+0x10/0x18 The cdev_device_add/del() API was created to address this issue (see commit 233ed09d7fda), use it instead of cdev add/del(). Fixes: c0cdc19f84a4 ("rpmsg: Driver for user space endpoint interface") Signed-off-by: Sujit Kautkar Signed-off-by: Matthias Kaehlcke Reviewed-by: Mathieu Poirier Reviewed-by: Bjorn Andersson --- Changes in v5: - added 'Fixes' tag - added 'Reviewed-by' tags from Mathieu and Bjorn Changes in v4: - call cdev_device_del() from rpmsg_chrdev_remove() instead of rpmsg_ctrldev_release_device() - updated subject (was: "rpmsg: glink: Update cdev add/del API in rpmsg_ctrldev_release_device()") - updated commit message - replaced backtrace in commit message with one that doesn't have a dump_backtrace() call Changes in v3: - Remove unecessary error check as per Matthias's comment Changes in v2: - Fix typo in commit message drivers/rpmsg/rpmsg_char.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 2bebc9b2d163..ba85f5d11960 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -461,7 +461,6 @@ static void rpmsg_ctrldev_release_device(struct device *dev) ida_simple_remove(&rpmsg_ctrl_ida, dev->id); ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); - cdev_del(&ctrldev->cdev); kfree(ctrldev); } @@ -496,19 +495,13 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev) dev->id = ret; dev_set_name(&ctrldev->dev, "rpmsg_ctrl%d", ret); - ret = cdev_add(&ctrldev->cdev, dev->devt, 1); + ret = cdev_device_add(&ctrldev->cdev, &ctrldev->dev); if (ret) goto free_ctrl_ida; /* We can now rely on the release function for cleanup */ dev->release = rpmsg_ctrldev_release_device; - ret = device_add(dev); - if (ret) { - dev_err(&rpdev->dev, "device_add failed: %d\n", ret); - put_device(dev); - } - dev_set_drvdata(&rpdev->dev, ctrldev); return ret; @@ -534,7 +527,7 @@ static void rpmsg_chrdev_remove(struct rpmsg_device *rpdev) if (ret) dev_warn(&rpdev->dev, "failed to nuke endpoints: %d\n", ret); - device_del(&ctrldev->dev); + cdev_device_del(&ctrldev->cdev, &ctrldev->dev); put_device(&ctrldev->dev); } From patchwork Mon Jan 10 17:12:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 12708981 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 202FFC4332F for ; Mon, 10 Jan 2022 17:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238030AbiAJRMk (ORCPT ); Mon, 10 Jan 2022 12:12:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238029AbiAJRMk (ORCPT ); Mon, 10 Jan 2022 12:12:40 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C216C06173F for ; Mon, 10 Jan 2022 09:12:40 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id lr15-20020a17090b4b8f00b001b19671cbebso790751pjb.1 for ; Mon, 10 Jan 2022 09:12:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2q7/MAZAh7Z468c4u6uZyJTQQsf14UeWtvjO7475Lf4=; b=dKyAuRhChQBofDa0LbFlCmLrjTbXp0bw3J8jkA7tEk0B/6vRs080mPuncugmN61/SR 4cIhol6li/qkCQ78/FRax34CnbJGF+WTkMtcBnfm8p/nOF+y/uEZXofvDDty/fIGQbAr z3O+qRVGjOZIcjc4H/LDh0VTSOqD5PUqf76Fg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2q7/MAZAh7Z468c4u6uZyJTQQsf14UeWtvjO7475Lf4=; b=0uRvVVQCyk4ZRPiIApOxxvO+WKzvKlbx01AJTSeidSJxsEXWJT2beTkQC9AQv6zQ/O 8dCJ5PaATf3Py5Wby2yw2sogZg8qXQGVn3lplk5QmyEOA9BaRT0Kwt95KvDuSpg5rQto rf+l8XEBx6tZWdeL1ySFsAeWjsEK3LEU6I/u0zrZVGqyODt7KuVk38MHlZSAdQwQPJEj RupkhkzC2yBmgoOlITz6ZeUvJBu7a6VIH3ekAbDJdX5PTwh32HLLLGIiOU15igUrF0pn eEJskBzEoheFw2MdWt6HkNapdIahuhjb6uDTR5pNNyj+LaS07b/jjxO4I5tUxwEJyY6o dzWQ== X-Gm-Message-State: AOAM533jO9YhK+65OstjlBrwCWLIcvTLWh5H6p8jWM+xikGoGe/Z/3rh KmH6gsfQ6FKWmJXNfpwP9c4W+g== X-Google-Smtp-Source: ABdhPJwlEX94jfy+uEsO6QsbzRevlQ28cifUkv0lf3xypkG3VuHBjvdSwrAGdp5aQpCoOtFYbz/idg== X-Received: by 2002:a17:902:e5cc:b0:14a:16f4:fddc with SMTP id u12-20020a170902e5cc00b0014a16f4fddcmr562862plf.33.1641834759647; Mon, 10 Jan 2022 09:12:39 -0800 (PST) Received: from localhost ([2620:15c:202:201:470e:3451:3aa4:4b43]) by smtp.gmail.com with UTF8SMTPSA id w4sm9238206pjq.7.2022.01.10.09.12.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jan 2022 09:12:39 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Ohad Ben-Cohen Cc: linux-kernel@vger.kernel.org, Sibi Sankar , Bjorn Andersson , Sujit Kautkar , Stephen Boyd , linux-remoteproc@vger.kernel.org, Matthias Kaehlcke , Mathieu Poirier Subject: [PATCH v5 2/2] rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev Date: Mon, 10 Jan 2022 09:12:32 -0800 Message-Id: <20220110091228.v5.2.Idde68b05b88d4a2e6e54766c653f3a6d9e419ce6@changeid> X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog In-Reply-To: <20220110091228.v5.1.Iaac908f3e3149a89190ce006ba166e2d3fd247a3@changeid> References: <20220110091228.v5.1.Iaac908f3e3149a89190ce006ba166e2d3fd247a3@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org struct rpmsg_eptdev contains a struct cdev. The current code frees the rpmsg_eptdev struct in rpmsg_eptdev_destroy(), but the cdev is a managed object, therefore its release is not predictable and the rpmsg_eptdev could be freed before the cdev is entirely released. The cdev_device_add/del() API was created to address this issue (see commit 233ed09d7fda), use it instead of cdev add/del(). Fixes: c0cdc19f84a4 ("rpmsg: Driver for user space endpoint interface") Signed-off-by: Matthias Kaehlcke Reviewed-by: Mathieu Poirier --- Changes in v5: - patch added to the series drivers/rpmsg/rpmsg_char.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index ba85f5d11960..5bc1e6017587 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -92,7 +92,7 @@ static int rpmsg_eptdev_destroy(struct device *dev, void *data) /* wake up any blocked readers */ wake_up_interruptible(&eptdev->readq); - device_del(&eptdev->dev); + cdev_device_del(&eptdev->cdev, &eptdev->dev); put_device(&eptdev->dev); return 0; @@ -380,19 +380,13 @@ static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev, dev->id = ret; dev_set_name(dev, "rpmsg%d", ret); - ret = cdev_add(&eptdev->cdev, dev->devt, 1); + ret = cdev_device_add(&eptdev->cdev, &eptdev->dev); if (ret) goto free_ept_ida; /* We can now rely on the release function for cleanup */ dev->release = rpmsg_eptdev_release_device; - ret = device_add(dev); - if (ret) { - dev_err(dev, "device_add failed: %d\n", ret); - put_device(dev); - } - return ret; free_ept_ida: