net: sctp: sctp_bind_addr: remove dead code

The sctp_bind_addr structure has a 'malloced' member that is
always set to 0, thus in sctp_bind_addr_free() the kfree()
part can never be called. This part is embedded into
sctp_ep_common anyway and never alloced.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index d581af00120b37c16ec9e08745807e4162cf8b26..64d469845f2527720753020b790285317dd95a41 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1093,8 +1093,6 @@ struct sctp_bind_addr {
         *      peer(s) in INIT and INIT ACK chunks.
         */
        struct list_head address_list;
-
-       int malloced;        /* Are we kfree()able?  */
 };
 
 void sctp_bind_addr_init(struct sctp_bind_addr *, __u16 port);

diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index d886b3bf84f5a1823e208d3c784db05a6c88938a..41145fe31813bc70907a9bdf9bba92886246b5b6 100644 (file)
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -131,8 +131,6 @@ int sctp_bind_addr_dup(struct sctp_bind_addr *dest,
  */
 void sctp_bind_addr_init(struct sctp_bind_addr *bp, __u16 port)
 {
-       bp->malloced = 0;
-
        INIT_LIST_HEAD(&bp->address_list);
        bp->port = port;
 }
@@ -155,11 +153,6 @@ void sctp_bind_addr_free(struct sctp_bind_addr *bp)
 {
        /* Empty the bind address list. */
        sctp_bind_addr_clean(bp);
-
-       if (bp->malloced) {
-               kfree(bp);
-               SCTP_DBG_OBJCNT_DEC(bind_addr);
-       }
 }
 
 /* Add an address to the bind address list in the SCTP_bind_addr structure. */