lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Dec 2010 17:11:49 +0900 From: Yoichi Yuasa <yuasa@...ux-mips.org> To: "David S. Miller" <davem@...emloft.net> Cc: yuasa@...ux-mips.org, netdev <netdev@...r.kernel.org> Subject: [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process() Signed-off-by: Yoichi Yuasa <yuasa@...ux-mips.org> --- net/ipv4/tcp_input.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 824e8c8..ae4200c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5623,9 +5623,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK, TCP_DELACK_MAX, TCP_RTO_MAX); -discard: - __kfree_skb(skb); - return 0; + goto discard; } else { tcp_send_ack(sk); } @@ -5704,7 +5702,9 @@ discard: discard_and_undo: tcp_clear_options(&tp->rx_opt); tp->rx_opt.mss_clamp = saved_clamp; - goto discard; +discard: + __kfree_skb(skb); + return 0; reset_and_undo: tcp_clear_options(&tp->rx_opt); -- 1.7.3.3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists