Skip to content

Commit 09ea22a

Browse files
Ke Ligregkh
Ke Li
authored andcommitted
net: Properly typecast int values to set sk_max_pacing_rate
[ Upstream commit 700465f ] In setsockopt(SO_MAX_PACING_RATE) on 64bit systems, sk_max_pacing_rate, after extended from 'u32' to 'unsigned long', takes unintentionally hiked value whenever assigned from an 'int' value with MSB=1, due to binary sign extension in promoting s32 to u64, e.g. 0x80000000 becomes 0xFFFFFFFF80000000. Thus inflated sk_max_pacing_rate causes subsequent getsockopt to return ~0U unexpectedly. It may also result in increased pacing rate. Fix by explicitly casting the 'int' value to 'unsigned int' before assigning it to sk_max_pacing_rate, for zero extension to happen. Fixes: 76a9ebe ("net: extend sk_pacing_rate to unsigned long") Signed-off-by: Ji Li <jli@akamai.com> Signed-off-by: Ke Li <keli@akamai.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20201022064146.79873-1-keli@akamai.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 432336b commit 09ea22a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

net/core/filter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4270,7 +4270,8 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
42704270
cmpxchg(&sk->sk_pacing_status,
42714271
SK_PACING_NONE,
42724272
SK_PACING_NEEDED);
4273-
sk->sk_max_pacing_rate = (val == ~0U) ? ~0UL : val;
4273+
sk->sk_max_pacing_rate = (val == ~0U) ?
4274+
~0UL : (unsigned int)val;
42744275
sk->sk_pacing_rate = min(sk->sk_pacing_rate,
42754276
sk->sk_max_pacing_rate);
42764277
break;

net/core/sock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
11061106

11071107
case SO_MAX_PACING_RATE:
11081108
{
1109-
unsigned long ulval = (val == ~0U) ? ~0UL : val;
1109+
unsigned long ulval = (val == ~0U) ? ~0UL : (unsigned int)val;
11101110

11111111
if (sizeof(ulval) != sizeof(val) &&
11121112
optlen >= sizeof(ulval) &&

0 commit comments

Comments
 (0)