evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rxrpc: out of bound read in debug code

Browse source 
Smatch complains because we are using an untrusted index into the
rxrpc_acks[] array.  It's just a read and it's only in the debug code,
but it's simple enough to add a check and fix it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dan Carpenter 2014-01-20 13:28:59 +03:00 • committed by David S. Miller
parent 2fa053a0a2
commit 08d4d217df
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
net/rxrpc/ar-ack.c
View file

@ -21,10 +21,17 @@
static unsigned int rxrpc_ack_defer = 1; static unsigned int rxrpc_ack_defer = 1;
static const char *const rxrpc_acks[] = { static const char *rxrpc_acks(u8 reason)
"---", "REQ", "DUP", "OOS", "WIN", "MEM", "PNG", "PNR", "DLY", "IDL", {
"-?-" static const char *const str[] = {
}; "---", "REQ", "DUP", "OOS", "WIN", "MEM", "PNG", "PNR", "DLY",
"IDL", "-?-"
};
if (reason >= ARRAY_SIZE(str))
reason = ARRAY_SIZE(str) - 1;
return str[reason];
}
static const s8 rxrpc_ack_priority[] = { static const s8 rxrpc_ack_priority[] = {
[0] = 0, [0] = 0,
@ -50,7 +57,7 @@ void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
ASSERTCMP(prior, >, 0); ASSERTCMP(prior, >, 0);
_enter("{%d},%s,%%%x,%u", _enter("{%d},%s,%%%x,%u",
call->debug_id, rxrpc_acks[ack_reason], ntohl(serial), call->debug_id, rxrpc_acks(ack_reason), ntohl(serial),
immediate); immediate);
if (prior < rxrpc_ack_priority[call->ackr_reason]) { if (prior < rxrpc_ack_priority[call->ackr_reason]) {
@ -637,7 +644,7 @@ process_further:
hard, hard,
ntohl(ack.previousPacket), ntohl(ack.previousPacket),
ntohl(ack.serial), ntohl(ack.serial),
rxrpc_acks[ack.reason], rxrpc_acks(ack.reason),
ack.nAcks); ack.nAcks);
rxrpc_extract_ackinfo(call, skb, latest, ack.nAcks); rxrpc_extract_ackinfo(call, skb, latest, ack.nAcks);
@ -1180,7 +1187,7 @@ send_ACK:
ntohl(ack.firstPacket), ntohl(ack.firstPacket),
ntohl(ack.previousPacket), ntohl(ack.previousPacket),
ntohl(ack.serial), ntohl(ack.serial),
rxrpc_acks[ack.reason], rxrpc_acks(ack.reason),
ack.nAcks); ack.nAcks);
del_timer_sync(&call->ack_timer); del_timer_sync(&call->ack_timer);