sctp: remove an unnecessary check from sctp_endpoint_destroy
authorXin Long <lucien.xin@gmail.com>
Thu, 29 Jun 2017 09:28:06 +0000 (17:28 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Jul 2017 15:46:57 +0000 (08:46 -0700)
ep->base.sk gets it's value since sctp_endpoint_new, nowhere
will change it. So there's no need to check if it's null, as
it can never be null.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/endpointola.c

index 3dcd0ecf3d99f74ec8ed4aad149bd32950ab23ef..7772ca40ddaf5c3cce7e668506e7a47fbd70aeed 100644 (file)
@@ -268,16 +268,14 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
 
        memset(ep->secret_key, 0, sizeof(ep->secret_key));
 
-       /* Give up our hold on the sock. */
        sk = ep->base.sk;
-       if (sk != NULL) {
-               /* Remove and free the port */
-               if (sctp_sk(sk)->bind_hash)
-                       sctp_put_port(sk);
+       /* Remove and free the port */
+       if (sctp_sk(sk)->bind_hash)
+               sctp_put_port(sk);
 
-               sctp_sk(sk)->ep = NULL;
-               sock_put(sk);
-       }
+       sctp_sk(sk)->ep = NULL;
+       /* Give up our hold on the sock */
+       sock_put(sk);
 
        kfree(ep);
        SCTP_DBG_OBJCNT_DEC(ep);