From: Ilya Maximets Date: Wed, 25 Nov 2015 08:23:50 +0000 (+0300) Subject: netdev-linux: Remove unreachable code in netdev_linux_rx_recv_tap(). X-Git-Tag: v2.5.0~274 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=bc85690660abea9492f3cd3a51e696ccfad315e0 netdev-linux: Remove unreachable code in netdev_linux_rx_recv_tap(). While splitting netdev_linux_rx_recv() into netdev_linux_rx_recv_sock() and netdev_linux_rx_recv_tap() in commit b73c85181df9 ("netdev-linux: Read packet auxdata to obtain vlan_tid") error handling part was copied 'as is' to both functions. But in case of netdev_linux_rx_recv_tap(), according to POSIX, the number of bytes read shall never be greater than 'size'. Signed-off-by: Ilya Maximets Signed-off-by: Ben Pfaff --- diff --git a/AUTHORS b/AUTHORS index cabb28848..79a049ec4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -80,6 +80,7 @@ Hao Zheng hzheng@nicira.com Helmut Schaa helmut.schaa@googlemail.com Huanle Han hanxueluo@gmail.com Ian Campbell Ian.Campbell@citrix.com +Ilya Maximets i.maximets@samsung.com Isaku Yamahata yamahata@valinux.co.jp James P. roampune@gmail.com James Page james.page@ubuntu.com diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index e047be58c..ed7886889 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1040,8 +1040,6 @@ netdev_linux_rxq_recv_tap(int fd, struct dp_packet *buffer) if (retval < 0) { return errno; - } else if (retval > size) { - return EMSGSIZE; } dp_packet_set_size(buffer, dp_packet_size(buffer) + retval);