* [dpdk-stable] [PATCH] vhost: check vhost message header size read
@ 2020-01-16 10:44 Maxime Coquelin
2020-01-17 7:54 ` Tiwei Bie
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Coquelin @ 2020-01-16 10:44 UTC (permalink / raw)
To: dev, tiwei.bie, zhihong.wang; +Cc: Maxime Coquelin, stable, Ilja Van Sprundel
This patch adds a check to ensure the read size of
the Vhost-user message header is not smaller than
the expected size.
Fixes: 8f972312b8f4 ("vhost: support vhost-user")
Cc: stable@dpdk.org
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/vhost_user.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 69b84a8820..0b7d1e288e 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2440,8 +2440,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
ret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,
msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);
- if (ret <= 0)
+ if (ret <= 0) {
return ret;
+ } else if (ret != VHOST_USER_HDR_SIZE) {
+ VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n");
+ return -1;
+ }
if (msg->size) {
if (msg->size > sizeof(msg->payload)) {
--
2.21.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [PATCH] vhost: check vhost message header size read
2020-01-16 10:44 [dpdk-stable] [PATCH] vhost: check vhost message header size read Maxime Coquelin
@ 2020-01-17 7:54 ` Tiwei Bie
2020-02-05 14:12 ` Maxime Coquelin
0 siblings, 1 reply; 3+ messages in thread
From: Tiwei Bie @ 2020-01-17 7:54 UTC (permalink / raw)
To: Maxime Coquelin; +Cc: dev, zhihong.wang, stable, Ilja Van Sprundel
On Thu, Jan 16, 2020 at 11:44:44AM +0100, Maxime Coquelin wrote:
> This patch adds a check to ensure the read size of
> the Vhost-user message header is not smaller than
> the expected size.
>
> Fixes: 8f972312b8f4 ("vhost: support vhost-user")
> Cc: stable@dpdk.org
>
> Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/librte_vhost/vhost_user.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 69b84a8820..0b7d1e288e 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -2440,8 +2440,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
>
> ret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,
> msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);
> - if (ret <= 0)
> + if (ret <= 0) {
> return ret;
> + } else if (ret != VHOST_USER_HDR_SIZE) {
> + VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n");
> + return -1;
It's better to close the potential fds in msg->fds[]
e.g. by calling close_msg_fds(msg).
Regards,
Tiwei
> + }
>
> if (msg->size) {
> if (msg->size > sizeof(msg->payload)) {
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [PATCH] vhost: check vhost message header size read
2020-01-17 7:54 ` Tiwei Bie
@ 2020-02-05 14:12 ` Maxime Coquelin
0 siblings, 0 replies; 3+ messages in thread
From: Maxime Coquelin @ 2020-02-05 14:12 UTC (permalink / raw)
To: Tiwei Bie; +Cc: dev, zhihong.wang, stable, Ilja Van Sprundel
On 1/17/20 8:54 AM, Tiwei Bie wrote:
> On Thu, Jan 16, 2020 at 11:44:44AM +0100, Maxime Coquelin wrote:
>> This patch adds a check to ensure the read size of
>> the Vhost-user message header is not smaller than
>> the expected size.
>>
>> Fixes: 8f972312b8f4 ("vhost: support vhost-user")
>> Cc: stable@dpdk.org
>>
>> Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> lib/librte_vhost/vhost_user.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
>> index 69b84a8820..0b7d1e288e 100644
>> --- a/lib/librte_vhost/vhost_user.c
>> +++ b/lib/librte_vhost/vhost_user.c
>> @@ -2440,8 +2440,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
>>
>> ret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,
>> msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);
>> - if (ret <= 0)
>> + if (ret <= 0) {
>> return ret;
>> + } else if (ret != VHOST_USER_HDR_SIZE) {
>> + VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n");
>> + return -1;
>
> It's better to close the potential fds in msg->fds[]
> e.g. by calling close_msg_fds(msg).
Correct, adding it in v2.
Thanks,
Maxime
> Regards,
> Tiwei
>
>> + }
>>
>> if (msg->size) {
>> if (msg->size > sizeof(msg->payload)) {
>> --
>> 2.21.0
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-05 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16 10:44 [dpdk-stable] [PATCH] vhost: check vhost message header size read Maxime Coquelin
2020-01-17 7:54 ` Tiwei Bie
2020-02-05 14:12 ` Maxime Coquelin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).