kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tipc: refactor accept() code for improved readability

Browse source 
In TIPC's accept() routine, there is a large block of code relating
to initialization of a new socket, all within an if condition checking
if the allocation succeeded.

Here, we simply flip the check of the if, so that the main execution
path stays at the same indentation level, which improves readability.
If the allocation fails, we jump to an already existing exit label.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
Paul Gortmaker 2012-12-04 11:01:55 -05:00
parent 258f8667a2
commit 0fef8f205f
1 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
net/tipc/socket.c
View file

@ -1509,8 +1509,13 @@ static int listen(struct socket *sock, int len)
*/ */
static int accept(struct socket *sock, struct socket *new_sock, int flags) static int accept(struct socket *sock, struct socket *new_sock, int flags)
{ {
struct sock *sk = sock->sk; struct sock *new_sk, *sk = sock->sk;
struct sk_buff *buf; struct sk_buff *buf;
struct tipc_sock *new_tsock;
struct tipc_port *new_tport;
struct tipc_msg *msg;
u32 new_ref;
int res; int res;
lock_sock(sk); lock_sock(sk);
@ -1536,49 +1541,51 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags)
buf = skb_peek(&sk->sk_receive_queue); buf = skb_peek(&sk->sk_receive_queue);
res = tipc_create(sock_net(sock->sk), new_sock, 0, 0); res = tipc_create(sock_net(sock->sk), new_sock, 0, 0);
if (!res) { if (res)
struct sock *new_sk = new_sock->sk; goto exit;
struct tipc_sock *new_tsock = tipc_sk(new_sk);
struct tipc_port *new_tport = new_tsock->p;
u32 new_ref = new_tport->ref;
struct tipc_msg *msg = buf_msg(buf);
/* we lock on new_sk; but lockdep sees the lock on sk */ new_sk = new_sock->sk;
lock_sock_nested(new_sk, SINGLE_DEPTH_NESTING); new_tsock = tipc_sk(new_sk);
new_tport = new_tsock->p;
new_ref = new_tport->ref;
msg = buf_msg(buf);
/* /* we lock on new_sk; but lockdep sees the lock on sk */
* Reject any stray messages received by new socket lock_sock_nested(new_sk, SINGLE_DEPTH_NESTING);
* before the socket lock was taken (very, very unlikely)
*/
reject_rx_queue(new_sk);
/* Connect new socket to it's peer */ /*
new_tsock->peer_name.ref = msg_origport(msg); * Reject any stray messages received by new socket
new_tsock->peer_name.node = msg_orignode(msg); * before the socket lock was taken (very, very unlikely)
tipc_connect(new_ref, &new_tsock->peer_name); */
new_sock->state = SS_CONNECTED; reject_rx_queue(new_sk);
tipc_set_portimportance(new_ref, msg_importance(msg)); /* Connect new socket to it's peer */
if (msg_named(msg)) { new_tsock->peer_name.ref = msg_origport(msg);
new_tport->conn_type = msg_nametype(msg); new_tsock->peer_name.node = msg_orignode(msg);
new_tport->conn_instance = msg_nameinst(msg); tipc_connect(new_ref, &new_tsock->peer_name);
} new_sock->state = SS_CONNECTED;
/* tipc_set_portimportance(new_ref, msg_importance(msg));
* Respond to 'SYN-' by discarding it & returning 'ACK'-. if (msg_named(msg)) {
* Respond to 'SYN+' by queuing it on new socket. new_tport->conn_type = msg_nametype(msg);
*/ new_tport->conn_instance = msg_nameinst(msg);
if (!msg_data_sz(msg)) {
struct msghdr m = {NULL,};
advance_rx_queue(sk);
send_packet(NULL, new_sock, &m, 0);
} else {
__skb_dequeue(&sk->sk_receive_queue);
__skb_queue_head(&new_sk->sk_receive_queue, buf);
}
release_sock(new_sk);
} }
/*
* Respond to 'SYN-' by discarding it & returning 'ACK'-.
* Respond to 'SYN+' by queuing it on new socket.
*/
if (!msg_data_sz(msg)) {
struct msghdr m = {NULL,};
advance_rx_queue(sk);
send_packet(NULL, new_sock, &m, 0);
} else {
__skb_dequeue(&sk->sk_receive_queue);
__skb_queue_head(&new_sk->sk_receive_queue, buf);
}
release_sock(new_sk);
exit: exit:
release_sock(sk); release_sock(sk);
return res; return res;