diff options
author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-06-09 12:08:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-11 18:01:30 -0400 |
commit | 02c00c2ab0807ec64b480e899d2619e64566a0af (patch) | |
tree | 5d095614085cc212ed347df4e996fc376f308a90 /net/tipc/socket.c | |
parent | cf97b8ff22a0d8b81dead6baff551642c9ead8e7 (diff) |
tipc: fix potential bug in function tipc_backlog_rcv
In commit 4f4482dcd9a0606a30541ff165ddaca64748299b ("tipc: compensate
for double accounting in socket rcv buffer") we access 'truesize' of
a received buffer after it might have been released by the function
filter_rcv().
In this commit we correct this by reading the value of 'truesize' to
the stack before delivering the buffer to filter_rcv().
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 08d87fc80b10..ef0475568f9e 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * net/tipc/socket.c: TIPC socket API | 2 | * net/tipc/socket.c: TIPC socket API |
3 | * | 3 | * |
4 | * Copyright (c) 2001-2007, 2012-2014, Ericsson AB | 4 | * Copyright (c) 2001-2007, 2012-2014, Ericsson AB |
5 | * Copyright (c) 2004-2008, 2010-2013, Wind River Systems | 5 | * Copyright (c) 2004-2008, 2010-2013, Wind River Systems |
@@ -1431,13 +1431,14 @@ static int tipc_backlog_rcv(struct sock *sk, struct sk_buff *buf) | |||
1431 | { | 1431 | { |
1432 | u32 res; | 1432 | u32 res; |
1433 | struct tipc_sock *tsk = tipc_sk(sk); | 1433 | struct tipc_sock *tsk = tipc_sk(sk); |
1434 | uint truesize = buf->truesize; | ||
1434 | 1435 | ||
1435 | res = filter_rcv(sk, buf); | 1436 | res = filter_rcv(sk, buf); |
1436 | if (unlikely(res)) | 1437 | if (unlikely(res)) |
1437 | tipc_reject_msg(buf, res); | 1438 | tipc_reject_msg(buf, res); |
1438 | 1439 | ||
1439 | if (atomic_read(&tsk->dupl_rcvcnt) < TIPC_CONN_OVERLOAD_LIMIT) | 1440 | if (atomic_read(&tsk->dupl_rcvcnt) < TIPC_CONN_OVERLOAD_LIMIT) |
1440 | atomic_add(buf->truesize, &tsk->dupl_rcvcnt); | 1441 | atomic_add(truesize, &tsk->dupl_rcvcnt); |
1441 | 1442 | ||
1442 | return 0; | 1443 | return 0; |
1443 | } | 1444 | } |