From: Jason Wang <jasowang@redhat.com>
To: Stefano Garzarella <sgarzare@redhat.com>,
virtualization@lists.linux-foundation.org
Cc: netdev@vger.kernel.org, Zhu Lingshan <lingshan.zhu@intel.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [PATCH 2/2] vhost-vdpa: set v->config_ctx to NULL if eventfd_ctx_fdget() fails
Date: Fri, 12 Mar 2021 14:34:07 +0800 [thread overview]
Message-ID: <a5eac458-eed7-df75-66ac-0a8349ad09b0@redhat.com> (raw)
In-Reply-To: <20210311135257.109460-3-sgarzare@redhat.com>
On 2021/3/11 9:52 下午, Stefano Garzarella wrote:
> In vhost_vdpa_set_config_call() if eventfd_ctx_fdget() fails the
> 'v->config_ctx' contains an error instead of a valid pointer.
>
> Since we consider 'v->config_ctx' valid if it is not NULL, we should
> set it to NULL in this case to avoid to use an invalid pointer in
> other functions such as vhost_vdpa_config_put().
>
> Fixes: 776f395004d8 ("vhost_vdpa: Support config interrupt in vdpa")
> Cc: lingshan.zhu@intel.com
> Cc: stable@vger.kernel.org
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vhost/vdpa.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
> index 00796e4ecfdf..f9ecdce5468a 100644
> --- a/drivers/vhost/vdpa.c
> +++ b/drivers/vhost/vdpa.c
> @@ -331,8 +331,12 @@ static long vhost_vdpa_set_config_call(struct vhost_vdpa *v, u32 __user *argp)
> if (!IS_ERR_OR_NULL(ctx))
> eventfd_ctx_put(ctx);
>
> - if (IS_ERR(v->config_ctx))
> - return PTR_ERR(v->config_ctx);
> + if (IS_ERR(v->config_ctx)) {
> + long ret = PTR_ERR(v->config_ctx);
> +
> + v->config_ctx = NULL;
> + return ret;
> + }
>
> v->vdpa->config->set_config_cb(v->vdpa, &cb);
>
next prev parent reply other threads:[~2021-03-12 6:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 13:52 [PATCH 0/2] vhost-vdpa: fix issues around v->config_ctx handling Stefano Garzarella
2021-03-11 13:52 ` [PATCH 1/2] vhost-vdpa: fix use-after-free of v->config_ctx Stefano Garzarella
2021-03-12 1:37 ` Zhu, Lingshan
2021-03-12 6:33 ` Jason Wang
2021-03-11 13:52 ` [PATCH 2/2] vhost-vdpa: set v->config_ctx to NULL if eventfd_ctx_fdget() fails Stefano Garzarella
2021-03-12 6:34 ` Jason Wang [this message]
2021-03-11 16:42 ` [PATCH 0/2] vhost-vdpa: fix issues around v->config_ctx handling Michael S. Tsirkin
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=a5eac458-eed7-df75-66ac-0a8349ad09b0@redhat.com \
--to=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lingshan.zhu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sgarzare@redhat.com \
--cc=virtualization@lists.linux-foundation.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®