From: "Xia, Chenbo" <chenbo.xia@intel.com> To: Maxime Coquelin <maxime.coquelin@redhat.com>, "dev@dpdk.org" <dev@dpdk.org>, "Ding, Xuan" <xuan.ding@intel.com>, "stephen@networkplumber.org" <stephen@networkplumber.org>, "thomas@monjalon.net" <thomas@monjalon.net>, "stable@dpdk.org" <stable@dpdk.org> Subject: Re: [dpdk-dev] [PATCH v2 2/3] vhost: fix fd leak in dirty logging setup Date: Mon, 9 Nov 2020 12:07:20 +0000 Message-ID: <MN2PR11MB4063E61326E0D1B4EFAFB8F89CEA0@MN2PR11MB4063.namprd11.prod.outlook.com> (raw) In-Reply-To: <20201109112600.250779-3-maxime.coquelin@redhat.com> Hi Maxime, > -----Original Message----- > From: Maxime Coquelin <maxime.coquelin@redhat.com> > Sent: Monday, November 9, 2020 7:26 PM > To: dev@dpdk.org; Ding, Xuan <xuan.ding@intel.com>; > stephen@networkplumber.org; thomas@monjalon.net; stable@dpdk.org; Xia, > Chenbo <chenbo.xia@intel.com> > Cc: Maxime Coquelin <maxime.coquelin@redhat.com> > Subject: [PATCH v2 2/3] vhost: fix fd leak in dirty logging setup > > This patch fixes a file descriptor leak which happens > in the error path of vhost_user_set_log_base(). > > Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") > Cc: stable@dpdk.org > > Reported-by: Xuan Ding <xuan.ding@intel.com> > Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com> > --- > lib/librte_vhost/vhost_user.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c > index 473fd778ca..e4ad5f6baf 100644 > --- a/lib/librte_vhost/vhost_user.c > +++ b/lib/librte_vhost/vhost_user.c > @@ -2076,7 +2076,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, > struct VhostUserMsg *msg, > > if (fd < 0) { > VHOST_LOG_CONFIG(ERR, "invalid log fd: %d\n", fd); > - return RTE_VHOST_MSG_RESULT_ERR; > + goto close_msg_fds; I remember we have agreed on simply return here? As I look back to v1, I think you may modify the wrong place. Because I see another 'goto close_msg_fds' is deleted compared with v1 😊. if (msg->size != sizeof(VhostUserLog)) { VHOST_LOG_CONFIG(ERR, "invalid log base msg size: %"PRId32" != %d\n", msg->size, (int)sizeof(VhostUserLog)); - return RTE_VHOST_MSG_RESULT_ERR; + goto close_msg_fds; Thanks! Chenbo > } > > if (msg->size != sizeof(VhostUserLog)) { > @@ -2094,7 +2094,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, > struct VhostUserMsg *msg, > VHOST_LOG_CONFIG(ERR, > "log offset %#"PRIx64" and log size %#"PRIx64" > overflow\n", > off, size); > - return RTE_VHOST_MSG_RESULT_ERR; > + goto close_msg_fds; > } > > VHOST_LOG_CONFIG(INFO, > @@ -2131,6 +2131,10 @@ vhost_user_set_log_base(struct virtio_net **pdev, > struct VhostUserMsg *msg, > msg->fd_num = 0; > > return RTE_VHOST_MSG_RESULT_REPLY; > + > +close_msg_fds: > + close_msg_fds(msg); > + return RTE_VHOST_MSG_RESULT_ERR; > } > > static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused, > -- > 2.26.2
next prev parent reply other threads:[~2020-11-09 12:07 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-09 11:25 [dpdk-dev] [PATCH v2 0/3] vhost: fix fd an memory leaks Maxime Coquelin 2020-11-09 11:25 ` [dpdk-dev] [PATCH v2 1/3] vhost: fix error path when setting memory tables Maxime Coquelin 2020-11-09 11:25 ` [dpdk-dev] [PATCH v2 2/3] vhost: fix fd leak in dirty logging setup Maxime Coquelin 2020-11-09 12:07 ` Xia, Chenbo [this message] 2020-11-09 12:11 ` Maxime Coquelin 2020-11-09 11:26 ` [dpdk-dev] [PATCH v2 3/3] vhost: fix fd leak in kick setup Maxime Coquelin
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=MN2PR11MB4063E61326E0D1B4EFAFB8F89CEA0@MN2PR11MB4063.namprd11.prod.outlook.com \ --to=chenbo.xia@intel.com \ --cc=dev@dpdk.org \ --cc=maxime.coquelin@redhat.com \ --cc=stable@dpdk.org \ --cc=stephen@networkplumber.org \ --cc=thomas@monjalon.net \ --cc=xuan.ding@intel.com \ /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
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git