tipc: move premature initilalization of stack variables
Subsystems (3)
PATCH 1/1 tipc: move premature initilalization of stack variables
In the function tipc_rcv() we initialize a couple of stack variables from the message header before that same header has been validated. In rare cases when the arriving header is non-linar, the validation function itself may linearize the buffer by calling skb_may_pull(), while the wrongly initialized stack fields are not updated accordingly.
We fix this in this commit.
--- net/tipc/node.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/tipc/node.c +7 -5
@@ -1505,19 +1505,21 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b) {struct sk_buff_head xmitq;struct tipc_node *n; -struct tipc_msg *hdr =buf_msg (skb); -int usr =msg_user (hdr); +struct tipc_msg *hdr;int bearer_id = b->identity;struct tipc_link_entry *le; -u16 bc_ack =msg_bcast_ack (hdr);u32 self =tipc_own_addr (net); -int rc =0 ; +int usr, rc =0 ; +u16 bc_ack;__skb_queue_head_init (&xmitq); -/* Ensure message is well-formed */ +/* Ensure message is well-formed before touching the header */ if (unlikely (!tipc_msg_validate (skb))) goto discard; + hdr =buf_msg (skb); + usr =msg_user (hdr); + bc_ack =msg_bcast_ack (hdr);/* Handle arrival of discovery or broadcast packet */ if (unlikely (msg_non_seq (hdr))) {
Signature · 6 lines
2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
From: Jon Maloy <[email protected]>
Date: Thu, 23 Feb 2017 11:10:31 -0500
Quoted 10 lines
In the function
tipc_rcv()we initialize a couple of stack variables from the message header before that same header has been validated. In rare cases when the arriving header is non-linar, the validation function itself may linearize the buffer by callingskb_may_pull(), while the wrongly initialized stack fields are not updated accordingly.We fix this in this commit.
Reported-by Matthew Wong <[email protected]>Signed-off-by Jon Maloy <[email protected]>
Applied.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot