From 9d4465004ef15402c5e7b55ba9491694985839e4 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Tue, 19 Jul 2016 08:35:03 +0200 Subject: [PATCH] droping upstreamed backport for fd >1023 handling File was d/p/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch Change-Id: I0ed62bf2c9432356595b5eca04b4583549b827df Signed-off-by: Christian Ehrhardt --- debian/patches/series | 1 - ...vhost-user-add-error-handling-for-fd-1023.patch | 129 --------------------- 2 files changed, 130 deletions(-) delete mode 100644 debian/patches/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch diff --git a/debian/patches/series b/debian/patches/series index cbebc519..49735402 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch ubuntu-fix-vhost-user-socket-permission.patch diff --git a/debian/patches/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch b/debian/patches/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch deleted file mode 100644 index dfad323c..00000000 --- a/debian/patches/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch +++ /dev/null @@ -1,129 +0,0 @@ -Description: backport of dpdk fix for LP: #1566874 - -Forwarded: n/a (already discussed upstream) -Author: Christian Ehrhardt -Last-Update: 2016-06-06 - -Extended by Christian Ehrhardt -Close fd on vserver->listenfd (Part of the upstream discussion) - -Original: -From: Patrik Andersson - -Protect against DPDK crash when allocation of listen fd >= 1023. -For events on fd:s >1023, the current implementation will trigger -an abort due to access outside of allocated bit mask. - -Corrections would include: - - * Match fdset_add() signature in fd_man.c to fd_man.h - * Handling of return codes from fdset_add() - * Addition of check of fd number in fdset_add_fd() - -The rationale behind the suggested code change is that, -fdset_event_dispatch() could attempt access outside of the FD_SET -bitmask if there is an event on a file descriptor that in turn -looks up a virtio file descriptor with a value > 1023. -Such an attempt will lead to an abort() and a restart of any -vswitch using DPDK. - -A discussion topic exist in the ovs-discuss mailing list that can -provide a little more background: - -http://openvswitch.org/pipermail/discuss/2016-February/020243.html - -Signed-off-by: Patrik Andersson ---- - fd_man.c | 11 ++++++----- - vhost-net-user.c | 23 +++++++++++++++++++++-- - 2 files changed, 27 insertions(+), 7 deletions(-) - -Index: deb_dpdk/lib/librte_vhost/vhost_user/fd_man.c -=================================================================== ---- deb_dpdk.orig/lib/librte_vhost/vhost_user/fd_man.c -+++ deb_dpdk/lib/librte_vhost/vhost_user/fd_man.c -@@ -71,20 +71,22 @@ fdset_find_free_slot(struct fdset *pfdse - return fdset_find_fd(pfdset, -1); - } - --static void -+static int - fdset_add_fd(struct fdset *pfdset, int idx, int fd, - fd_cb rcb, fd_cb wcb, void *dat) - { - struct fdentry *pfdentry; - -- if (pfdset == NULL || idx >= MAX_FDS) -- return; -+ if (pfdset == NULL || idx >= MAX_FDS || fd >= FD_SETSIZE) -+ return -1; - - pfdentry = &pfdset->fd[idx]; - pfdentry->fd = fd; - pfdentry->rcb = rcb; - pfdentry->wcb = wcb; - pfdentry->dat = dat; -+ -+ return 0; - } - - /** -@@ -150,12 +152,11 @@ fdset_add(struct fdset *pfdset, int fd, - - /* Find a free slot in the list. */ - i = fdset_find_free_slot(pfdset); -- if (i == -1) { -+ if (i == -1 || fdset_add_fd(pfdset, i, fd, rcb, wcb, dat) < 0) { - pthread_mutex_unlock(&pfdset->fd_mutex); - return -2; - } - -- fdset_add_fd(pfdset, i, fd, rcb, wcb, dat); - pfdset->num++; - - pthread_mutex_unlock(&pfdset->fd_mutex); -Index: deb_dpdk/lib/librte_vhost/vhost_user/vhost-net-user.c -=================================================================== ---- deb_dpdk.orig/lib/librte_vhost/vhost_user/vhost-net-user.c -+++ deb_dpdk/lib/librte_vhost/vhost_user/vhost-net-user.c -@@ -257,6 +257,7 @@ vhost_user_add_connection(int fd, struct - int vid; - size_t size; - struct vhost_user_connection *conn; -+ int ret; - - conn = malloc(sizeof(*conn)); - if (conn == NULL) { -@@ -278,7 +279,15 @@ vhost_user_add_connection(int fd, struct - - conn->vsocket = vsocket; - conn->vid = vid; -- fdset_add(&vhost_user.fdset, fd, vhost_user_msg_handler, NULL, conn); -+ ret = fdset_add(&vhost_user.fdset, fd, vhost_user_msg_handler, -+ NULL, conn); -+ if (ret < 0) { -+ free(conn); -+ close(fd); -+ RTE_LOG(ERR, VHOST_CONFIG, -+ "failed to add fd %d into vhost server fdset\n", -+ fd); -+ } - } - - /* call back when there is new vhost-user connection from client */ -@@ -469,8 +478,14 @@ vhost_user_create_server(struct vhost_us - goto err; - - vsocket->listenfd = fd; -- fdset_add(&vhost_user.fdset, fd, vhost_user_server_new_connection, -+ ret = fdset_add(&vhost_user.fdset, fd, vhost_user_server_new_connection, - NULL, vsocket); -+ if (ret < 0) { -+ RTE_LOG(ERR, VHOST_CONFIG, -+ "failed to add listen fd %d to vhost server fdset\n", -+ fd); -+ goto err; -+ } - - return 0; - -- 2.16.6