diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 07:52:17 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 07:52:17 +0100 |
commit | d40310f65771b3a1eb9af34af433136887a64251 (patch) | |
tree | aca0913593f44daee3845d72cca5bbd827b39012 /net/ipv4/udp.c | |
parent | e895bc1ebb31750f3baa74e074617d3cc5d0cee2 (diff) | |
parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
download | linux-stable-d40310f65771b3a1eb9af34af433136887a64251.tar.gz linux-stable-d40310f65771b3a1eb9af34af433136887a64251.tar.bz2 linux-stable-d40310f65771b3a1eb9af34af433136887a64251.zip |
Merge 5.5-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 4da5758cc718..93a355b6b092 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1475,7 +1475,7 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb) * queue contains some other skb */ rmem = atomic_add_return(size, &sk->sk_rmem_alloc); - if (rmem > (size + sk->sk_rcvbuf)) + if (rmem > (size + (unsigned int)sk->sk_rcvbuf)) goto uncharge_drop; spin_lock(&list->lock); |