From: Nikita Shubin <NShubin@topcon.com> Cc: Nikita Shubin <NShubin@topcon.com>, stable@vger.kernel.org, Ohad Ben-Cohen <ohad@wizery.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] remoteproc: Fix NULL pointer dereference in rproc_virtio_notify Date: Fri, 6 Mar 2020 10:03:25 +0300 [thread overview] Message-ID: <20200306070325.15232-1-NShubin@topcon.com> (raw) In-Reply-To: <20200305110218.8799-2-NShubin@topcon.com> Undefined rproc_ops .kick method in remoteproc driver will result in "Unable to handle kernel NULL pointer dereference" in rproc_virtio_notify, after firmware loading if: 1) .kick method wasn't defined in driver 2) resource_table exists in firmware and has "Virtio device entry" defined Let's refuse to register an rproc-induced virtio device if no kick method was defined for rproc. Signed-off-by: Nikita Shubin <NShubin@topcon.com> Fixes: 7a186941626d ("remoteproc: remove the single rpmsg vdev limitation") Cc: stable@vger.kernel.org --- drivers/remoteproc/remoteproc_virtio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c index 8c07cb2ca8ba..31a62a0b470e 100644 --- a/drivers/remoteproc/remoteproc_virtio.c +++ b/drivers/remoteproc/remoteproc_virtio.c @@ -334,6 +334,13 @@ int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id) struct rproc_mem_entry *mem; int ret; + if (rproc->ops->kick == NULL) { + ret = -EINVAL; + dev_err(dev, ".kick method not defined for %s", + rproc->name); + goto out; + } + /* Try to find dedicated vdev buffer carveout */ mem = rproc_find_carveout_by_name(rproc, "vdev%dbuffer", rvdev->index); if (mem) { -- 2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Nikita Shubin <NShubin@topcon.com> To: unlisted-recipients:; (no To-header on input) Cc: Nikita Shubin <NShubin@topcon.com>, stable@vger.kernel.org, Ohad Ben-Cohen <ohad@wizery.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] remoteproc: Fix NULL pointer dereference in rproc_virtio_notify Date: Fri, 6 Mar 2020 10:03:25 +0300 [thread overview] Message-ID: <20200306070325.15232-1-NShubin@topcon.com> (raw) In-Reply-To: <20200305110218.8799-2-NShubin@topcon.com> Undefined rproc_ops .kick method in remoteproc driver will result in "Unable to handle kernel NULL pointer dereference" in rproc_virtio_notify, after firmware loading if: 1) .kick method wasn't defined in driver 2) resource_table exists in firmware and has "Virtio device entry" defined Let's refuse to register an rproc-induced virtio device if no kick method was defined for rproc. Signed-off-by: Nikita Shubin <NShubin@topcon.com> Fixes: 7a186941626d ("remoteproc: remove the single rpmsg vdev limitation") Cc: stable@vger.kernel.org --- drivers/remoteproc/remoteproc_virtio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c index 8c07cb2ca8ba..31a62a0b470e 100644 --- a/drivers/remoteproc/remoteproc_virtio.c +++ b/drivers/remoteproc/remoteproc_virtio.c @@ -334,6 +334,13 @@ int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id) struct rproc_mem_entry *mem; int ret; + if (rproc->ops->kick == NULL) { + ret = -EINVAL; + dev_err(dev, ".kick method not defined for %s", + rproc->name); + goto out; + } + /* Try to find dedicated vdev buffer carveout */ mem = rproc_find_carveout_by_name(rproc, "vdev%dbuffer", rvdev->index); if (mem) { -- 2.24.1
next prev parent reply other threads:[~2020-03-06 7:03 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-28 11:08 [PATCH] remoteproc: error on kick missing nikita.shubin 2020-02-28 11:08 ` nikita.shubin 2020-03-02 17:44 ` Mathieu Poirier 2020-03-02 21:43 ` Bjorn Andersson 2020-03-02 21:43 ` Bjorn Andersson 2020-03-03 15:56 ` Mathieu Poirier 2020-03-04 14:09 ` nikita.shubin 2020-03-04 16:11 ` Mathieu Poirier 2020-03-05 11:02 ` [PATCH v3 0/1] remoteproc: Fix NULL pointer dereference in rproc_virtio_notify Nikita Shubin 2020-03-05 11:02 ` Nikita Shubin 2020-03-05 11:02 ` [PATCH v3 1/1] " Nikita Shubin 2020-03-05 11:02 ` Nikita Shubin 2020-03-06 7:03 ` Nikita Shubin [this message] 2020-03-06 7:03 ` [PATCH v4] " Nikita Shubin 2020-03-06 7:24 ` [PATCH v5] " Nikita Shubin 2020-03-06 7:24 ` Nikita Shubin 2020-03-07 23:20 ` Sasha Levin 2020-03-09 14:22 ` Arnaud POULIQUEN 2020-03-09 14:22 ` Arnaud POULIQUEN 2020-03-10 12:08 ` Nikita Shubin 2020-03-10 13:19 ` Arnaud POULIQUEN 2020-03-10 13:19 ` Arnaud POULIQUEN 2020-03-11 20:01 ` Bjorn Andersson 2020-03-11 20:01 ` Bjorn Andersson 2020-03-16 16:55 ` Mathieu Poirier 2020-03-17 14:24 ` Arnaud POULIQUEN 2020-03-21 17:57 ` Bjorn Andersson 2020-03-21 17:57 ` Bjorn Andersson 2020-03-26 5:46 ` patchwork-bot+linux-remoteproc 2020-03-07 23:20 ` [PATCH v4] " Sasha Levin 2020-03-07 23:20 ` [PATCH v3 1/1] " Sasha Levin 2020-03-26 5:47 ` [PATCH] remoteproc: error on kick missing patchwork-bot+linux-remoteproc
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200306070325.15232-1-NShubin@topcon.com \ --to=nshubin@topcon.com \ --cc=bjorn.andersson@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=ohad@wizery.com \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.