From patchwork Tue Apr 26 06:05:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangyu Hua X-Patchwork-Id: 12826499 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 1BA0FC433F5 for ; Tue, 26 Apr 2022 06:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244529AbiDZGJP (ORCPT ); Tue, 26 Apr 2022 02:09:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244499AbiDZGJO (ORCPT ); Tue, 26 Apr 2022 02:09:14 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 601BA3BA5D; Mon, 25 Apr 2022 23:06:08 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id m14-20020a17090a34ce00b001d5fe250e23so1593129pjf.3; Mon, 25 Apr 2022 23:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N5B5tUFMzlxSfom417st/n+sajnHc/81JexubgBewTM=; b=cjBliUXK+67eB8pugmyCFVT+uskSB4P9S6NfwmRLKtKpV320sgmZfMbMu6y7L2hrhX Tq42n3Nh7sNiXGMP7qhMCpp5Tq2f3QMOvwqGX1ylKz2PUlPXlBC1aKJBNk2wDVWdUSM2 AcomuMNPtE6LUcokRmfcPml34/0/zUSK9leDTCrEmya2G+GbZm1VH2WXKlbxJjmXdSFr Tsin56ooNLP9z6xQfg7Rll7NeoWaoK5w19ZW742eCNEHYRP4iYE+LCOrO2fEKHbGKhay nUzNQVUWhVKDWg4nYY1VFGjuaBcwWNCmhc9h0SPv0voPMI1uACtUqN2sQw3DjrXQ+dkq HQnQ== 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=N5B5tUFMzlxSfom417st/n+sajnHc/81JexubgBewTM=; b=tV3+63nPMGNSP355XvU70B+kkKCS07y2rMEtF7TxlVR+QDyFScNBHyI4UtthHX2ETd tqy8+t/ta0YwEaffjWD8To+9i3Zbcxg5KVXXWyh9Xnu2KWUJGd5MWninNFKuH9QlDDU+ rMZiH4kRKQvIZ/CDOYvdhECsTXRNtcSATWS6kB1PtnVNfTjR+Nh1isSkpRPImevWLh7j HgJsZv4+f4r5uvnHfgSD9t+EhlT0aAcLhe5kSxmgZ3QZx3TRicxZdzT+WF7RpTMflrSI 7/kKvvKRgepmLMJ2+Ah9DxHTeq/z2G3l1cU+VMrvkZ43vnpLUP2oYX5w2Q0rQugJZpe8 zHEg== X-Gm-Message-State: AOAM530VO9VamN1g6C62P25HiKt5+wzJsWVmSOS1eItLcPjt0wFs+yUQ 3dgsEP84YM0SSo1xObFmej88sddCsik= X-Google-Smtp-Source: ABdhPJz+MZ0gTzEQu/nIvsFW0/mTwW1gJKk1gin2GA6OY5WwKRcuV/LJaHvr0E7vDu+kssRncMF1iQ== X-Received: by 2002:a17:90a:1946:b0:1d2:d49b:1db with SMTP id 6-20020a17090a194600b001d2d49b01dbmr36098619pjh.30.1650953167967; Mon, 25 Apr 2022 23:06:07 -0700 (PDT) Received: from localhost.localdomain ([103.84.139.165]) by smtp.gmail.com with ESMTPSA id k13-20020a056a00134d00b0050a5867dd73sm13969135pfu.157.2022.04.25.23.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 23:06:07 -0700 (PDT) From: Hangyu Hua To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, arnaud.pouliquen@foss.st.com Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Hangyu Hua Subject: [PATCH v2 1/3] rpmsg: virtio: fix possible double free in rpmsg_probe() Date: Tue, 26 Apr 2022 14:05:34 +0800 Message-Id: <20220426060536.15594-2-hbh25y@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426060536.15594-1-hbh25y@gmail.com> References: <20220426060536.15594-1-hbh25y@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org vch will be free in virtio_rpmsg_release_device() when rpmsg_ns_register_device() fails. There is no need to call kfree() again. Fix this by changing error path from free_vch to free_ctrldev. Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device") Signed-off-by: Hangyu Hua Tested-by: Arnaud Pouliquen --- drivers/rpmsg/virtio_rpmsg_bus.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 3ede25b1f2e4..0130d0ba548c 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -973,7 +973,8 @@ static int rpmsg_probe(struct virtio_device *vdev) err = rpmsg_ns_register_device(rpdev_ns); if (err) - goto free_vch; + /* vch will be free in virtio_rpmsg_release_device() */ + goto free_ctrldev; } /* @@ -997,8 +998,6 @@ static int rpmsg_probe(struct virtio_device *vdev) return 0; -free_vch: - kfree(vch); free_ctrldev: rpmsg_virtio_del_ctrl_dev(rpdev_ctrl); free_coherent: From patchwork Tue Apr 26 06:05:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangyu Hua X-Patchwork-Id: 12826500 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 26802C433EF for ; Tue, 26 Apr 2022 06:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244499AbiDZGJT (ORCPT ); Tue, 26 Apr 2022 02:09:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244682AbiDZGJS (ORCPT ); Tue, 26 Apr 2022 02:09:18 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C2D73C493; Mon, 25 Apr 2022 23:06:11 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id i62so3083887pgd.6; Mon, 25 Apr 2022 23:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LKMVajePCkLYTsdraPhfT8Y66xPcxgdHhTEjl6+Zw6c=; b=GkFWtWhghH/aU5YmVPJwx1tYmqzCheL7g82PjRfM2Ac6OF26X/DAjLyME/EF8VTZUb LjtodfwIVJiX2qwpsTrYdGw/TJ9uRyj3SwNTcM90ndrnryyCt3AhufuWhZwtsEgx0lcD hvH9eJU11TuUihuw6N8Wn1NmffAS6dg4Y1niWGjhXm4186QsNT7XfT95fm7YCkE4y5H/ QPMG+tTprovlO1s86pHoAQnynOW0FZYvECnIj1fDp5ieu/N7hbp4VoMUGQ3gCszE0aZo dFzCgxmpIHFNC8kdcvg85oXJu7a5P4dCkgoo1/75iJ772w+FYNX8jPixoUGpRM+KNQ0Z o0NQ== 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=LKMVajePCkLYTsdraPhfT8Y66xPcxgdHhTEjl6+Zw6c=; b=5OrBq3BQ+3iw7THXTGwPce2yr5FPY7spaMS9CmQO7jF105J6NlYOToGpbY0XQkSYAw bbooXspatbeJibA20dsYVL1eE8LHSO85E5By/GYMhHRQmgx/mYMvKh2JVasJiKG2jbYm iDNjKIFnhhdCnlyq4gZm7kgJtllBkvHvW5Fd0zf4w+mgdfPxFfJ0W6X8Xj6WdppgIOFl tE81K2jtaCiv3nBCkRBf3ZXtNwJtSX9HgbWeMDF5gcuSit5C1Lp8HNeGJ7UDgMxQmzM3 2MfrXRP4bRH/QacxLTODnuuds5tYXi30dXPjqFlFW0mfFAASewzEHJq/94vUph/jM2K0 /Nmg== X-Gm-Message-State: AOAM531XZaxRl8St4xF7l7ggmCrvsuW19QeSiNnCu3AX1TKGqHf7nXNp 5nzjx59cNsKtEUIxM9K0Ats= X-Google-Smtp-Source: ABdhPJzA6d1D8KlutAa7AdNQikutyGTzJDWCZKTgClev/PQ8zg/ZO8lgOsOv50Z2Wv5G/PSAqXFTHg== X-Received: by 2002:a05:6a00:2402:b0:4e1:3df2:5373 with SMTP id z2-20020a056a00240200b004e13df25373mr22857741pfh.40.1650953171099; Mon, 25 Apr 2022 23:06:11 -0700 (PDT) Received: from localhost.localdomain ([103.84.139.165]) by smtp.gmail.com with ESMTPSA id k13-20020a056a00134d00b0050a5867dd73sm13969135pfu.157.2022.04.25.23.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 23:06:10 -0700 (PDT) From: Hangyu Hua To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, arnaud.pouliquen@foss.st.com Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Hangyu Hua Subject: [PATCH v2 2/3] rpmsg: virtio: fix possible double free in rpmsg_virtio_add_ctrl_dev() Date: Tue, 26 Apr 2022 14:05:35 +0800 Message-Id: <20220426060536.15594-3-hbh25y@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426060536.15594-1-hbh25y@gmail.com> References: <20220426060536.15594-1-hbh25y@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org vch will be free in virtio_rpmsg_release_device() when rpmsg_ctrldev_register_device() fails. There is no need to call kfree() again. Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device") Signed-off-by: Hangyu Hua Tested-by: Arnaud Pouliquen --- drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 0130d0ba548c..291fc1cfab7f 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -851,7 +851,7 @@ static struct rpmsg_device *rpmsg_virtio_add_ctrl_dev(struct virtio_device *vdev err = rpmsg_ctrldev_register_device(rpdev_ctrl); if (err) { - kfree(vch); + /* vch will be free in virtio_rpmsg_release_device() */ return ERR_PTR(err); } From patchwork Tue Apr 26 06:05:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangyu Hua X-Patchwork-Id: 12826501 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 59F60C433F5 for ; Tue, 26 Apr 2022 06:06:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244693AbiDZGJW (ORCPT ); Tue, 26 Apr 2022 02:09:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244731AbiDZGJV (ORCPT ); Tue, 26 Apr 2022 02:09:21 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60DE33CA5B; Mon, 25 Apr 2022 23:06:15 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id y14so16258848pfe.10; Mon, 25 Apr 2022 23:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zxsx4ZKYAxOkMFzPKK0OLLsxMKegRk3fFS29nU34Sng=; b=e24pDlaM+TWnZa8ggX7R5ojMhDcejDG5odEH9GhDu3UU+Q9/zxGz1EYxmrk3ieOaKz WuEZOFQdzU/Hq0B7cWKeZAoF7dkyauwDiGNphWRc8BI8DWtTF18Eu9DVIXIzE4287Lbu DsxzezPKoXc/Wrz/j6XofPpWYN8HFDeV2HJK74n87KtOfnqn1t6d6M5zl8VqUZzF5IUE nKPYjMSM///gFWuCKQ5wqcfwLjMqDhAo6Az+Gje+vPRQ4YqosfzJicBI4ig3GUXWwJSA 68QCzub5/q3hsnJsKOelPy6qWBI2Xw+xRzWZcUD3VIHxroWuNHzdYssyZiaajpWDMb8Z sKXQ== 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=zxsx4ZKYAxOkMFzPKK0OLLsxMKegRk3fFS29nU34Sng=; b=v+D6wRcS+KpJ9my1TCWx8CRko+ohb7g8DvftmguxRDkpAaT74cagV2FE/GswFxmEqJ 0px/9SGUiVt4NoDVbPWdWCbYqcaKzIw4WkcyqGomQeXPjYmuAqKdEVNbvvQwv3seO8On HDtYtgxVtDkC08OwtTYUxDsS4WQeMidxJntWtfRdO91vrqVkHcVke+Gk59JPoXgmOUZ1 S0DudrUefz4YvzYVNchFECuhixtQfrcneJzahvRzroqvVdS6XdAP+QKrmyKgwsXh/a07 d7X+F5W7McG1zAa2BDi+tDCKSM915jLmoRII6k3P8SllDNjpkeQTxJCFKxfD6MZbc/vF MaqA== X-Gm-Message-State: AOAM533cNI/DiFfSMKx6gPFfOV6utaV7hyEYPjbnhaIOCHllfObsUspA si4gcCdtU9oCqHpyjSzVG0c= X-Google-Smtp-Source: ABdhPJxXbBZxgeu7xrYCSXDIlP9axe93Bw7d99jH5yPRqTlr8/+YgL/jCjaFmLg7n5eMDE6dNxZofQ== X-Received: by 2002:aa7:943b:0:b0:505:70bd:61ab with SMTP id y27-20020aa7943b000000b0050570bd61abmr22531815pfo.58.1650953174977; Mon, 25 Apr 2022 23:06:14 -0700 (PDT) Received: from localhost.localdomain ([103.84.139.165]) by smtp.gmail.com with ESMTPSA id k13-20020a056a00134d00b0050a5867dd73sm13969135pfu.157.2022.04.25.23.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 23:06:14 -0700 (PDT) From: Hangyu Hua To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, arnaud.pouliquen@foss.st.com Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Hangyu Hua Subject: [PATCH v2 3/3] rpmsg: virtio: Fix the unregistration of the device rpmsg_ctrl Date: Tue, 26 Apr 2022 14:05:36 +0800 Message-Id: <20220426060536.15594-4-hbh25y@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426060536.15594-1-hbh25y@gmail.com> References: <20220426060536.15594-1-hbh25y@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Unregister the rpmsg_ctrl device instead of just freeing the the virtio_rpmsg_channel structure. This will properly unregister the device and call virtio_rpmsg_release_device() that frees the structure. Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device") Signed-off-by: Arnaud Pouliquen Cc: Hangyu Hua Reviewed-by: Hangyu Hua --- drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 291fc1cfab7f..485e95f506df 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -862,7 +862,7 @@ static void rpmsg_virtio_del_ctrl_dev(struct rpmsg_device *rpdev_ctrl) { if (!rpdev_ctrl) return; - kfree(to_virtio_rpmsg_channel(rpdev_ctrl)); + device_unregister(&rpdev_ctrl->dev); } static int rpmsg_probe(struct virtio_device *vdev)