tipc: potential divide by zero in tipc_link_recv_fragment()
Subsystems (4)
PATCH 2/2 tipc: potential divide by zero in tipc_link_recv_fragment()
The worry here is that fragm_sz could be zero since it comes from skb->data.
net/tipc/link.c +4 -2
@@ -2524,14 +2524,16 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,struct tipc_msg *imsg = (struct tipc_msg *)msg_data (fragm);u32 msg_sz =msg_size (imsg);u32 fragm_sz =msg_data_sz (fragm); -u32 exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz); +u32 exp_fragm_cnt;u32 max =TIPC_MAX_USER_MSG_SIZE +NAMED_H_SIZE ; +if (msg_type (imsg) =TIPC_MCAST_MSG ) max =TIPC_MAX_USER_MSG_SIZE +MCAST_H_SIZE ; -if (msg_size (imsg) > max) { +if (fragm_sz =0 ||msg_size (imsg) > max) {kfree_skb (fbuf);return 0 ; } + exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz); pbuf =tipc_buf_acquire (msg_size (imsg));if (pbuf !=NULL ) { pbuf->next = *pending;
Hello.
Quoted 15 lines · Dan Carpenter
The worry here is that
fragm_szcould be zero since it comes fromskb->data.Signed-off-by Dan Carpenter <[email protected]>net/tipc/link.c +1
-1@@ -2524,14 +2524,16 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,struct tipc_msg *imsg = (struct tipc_msg *)msg_data (fragm);u32 msg_sz =msg_size (imsg);u32 fragm_sz =msg_data_sz (fragm); -u32 exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz); +u32 exp_fragm_cnt;
net/tipc/link.c int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb, · line 2536
Quoted 10 lines
net/tipc/link.c +3
-1u32 max =TIPC_MAX_USER_MSG_SIZE +NAMED_H_SIZE ; +if (msg_type (imsg) =TIPC_MCAST_MSG ) max =TIPC_MAX_USER_MSG_SIZE +MCAST_H_SIZE ; -if (msg_size (imsg) > max) { +if (fragm_sz =0 ||msg_size (imsg) > max) {kfree_skb (fbuf);return 0 ; } + exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz);
Don't you think spaces around / should be added at least for
consistency with %?
WBR, Sergei
Quoted 24 lines · Sergei Shtylyov
Hello.
Quoted 20 lines · Dan Carpenter
The worry here is that
fragm_szcould be zero since it comes fromskb->data.Signed-off-by Dan Carpenter <[email protected]>net/tipc/link.c +2
-2@@ -2524,14 +2524,16 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,struct tipc_msg *imsg = (struct tipc_msg *)msg_data (fragm);u32 msg_sz =msg_size (imsg);u32 fragm_sz =msg_data_sz (fragm); -u32 exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz); +u32 exp_fragm_cnt;u32 max =TIPC_MAX_USER_MSG_SIZE +NAMED_H_SIZE ; +if (msg_type (imsg) =TIPC_MCAST_MSG ) max =TIPC_MAX_USER_MSG_SIZE +MCAST_H_SIZE ; -if (msg_size (imsg) > max) {
Quoted 8 lines
net/tipc/link.c int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb, · line 2536
Quoted 5 lines
net/tipc/link.c +2
-0+if (fragm_sz =0 ||msg_size (imsg) > max) {kfree_skb (fbuf);return 0 ; } + exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz);Don't you think spaces around / should be added at least for
consistency with %?
Yep. I missed that. I'll resend.
regards,
dan carpenter
PATCH v2 2/2 tipc: potential divide by zero in tipc_link_recv_fragment()
In reply to Sergei ShtylyovThe worry here is that fragm_sz could be zero since it comes from skb->data.
---
v2: fix a whitespace issue
net/tipc/link.c +4 -2
@@ -2524,14 +2524,16 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,struct tipc_msg *imsg = (struct tipc_msg *)msg_data (fragm);u32 msg_sz =msg_size (imsg);u32 fragm_sz =msg_data_sz (fragm); -u32 exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz); +u32 exp_fragm_cnt;u32 max =TIPC_MAX_USER_MSG_SIZE +NAMED_H_SIZE ; +if (msg_type (imsg) =TIPC_MCAST_MSG ) max =TIPC_MAX_USER_MSG_SIZE +MCAST_H_SIZE ; -if (msg_size (imsg) > max) { +if (fragm_sz =0 ||msg_size (imsg) > max) {kfree_skb (fbuf);return 0 ; } + exp_fragm_cnt = msg_sz / fragm_sz + !!(msg_sz % fragm_sz); pbuf =tipc_buf_acquire (msg_size (imsg));if (pbuf !=NULL ) { pbuf->next = *pending;
From: Dan Carpenter <[email protected]>
Date: Mon, 6 May 2013 22:31:17 +0300
Quoted 4 lines
The worry here is that
fragm_szcould be zero since it comes fromskb->data.Signed-off-by Dan Carpenter <[email protected]>
Applied.