diff options
author | Gustavo A. R. Silva <garsilva@embeddedor.com> | 2017-11-25 13:14:40 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-17 15:07:58 +0100 |
commit | 87ff3fb30de11a64d25a4a22f23def1ce77cf840 (patch) | |
tree | 9790b370e348ffb2eef8d5ea977006b6261cf718 /net | |
parent | 60335608e2f1ad6e55acaa4f13bd0f3bcd156dbd (diff) | |
download | linux-stable-87ff3fb30de11a64d25a4a22f23def1ce77cf840.tar.gz linux-stable-87ff3fb30de11a64d25a4a22f23def1ce77cf840.tar.bz2 linux-stable-87ff3fb30de11a64d25a4a22f23def1ce77cf840.zip |
net: openvswitch: datapath: fix data type in queue_gso_packets
[ Upstream commit 2734166e89639c973c6e125ac8bcfc2d9db72b70 ]
gso_type is being used in binary AND operations together with SKB_GSO_UDP.
The issue is that variable gso_type is of type unsigned short and
SKB_GSO_UDP expands to more than 16 bits:
SKB_GSO_UDP = 1 << 16
this makes any binary AND operation between gso_type and SKB_GSO_UDP to
be always zero, hence making some code unreachable and likely causing
undesired behavior.
Fix this by changing the data type of variable gso_type to unsigned int.
Addresses-Coverity-ID: 1462223
Fixes: 0c19f846d582 ("net: accept UFO datagrams from tuntap and packet")
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/openvswitch/datapath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 294444bb075c..363dd904733d 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -335,7 +335,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_info *upcall_info, uint32_t cutlen) { - unsigned short gso_type = skb_shinfo(skb)->gso_type; + unsigned int gso_type = skb_shinfo(skb)->gso_type; struct sw_flow_key later_key; struct sk_buff *segs, *nskb; int err; |