net: sctp: sctp_ulpq: remove 'malloced' struct member

Daniel Borkmann · davem330 · commit c1db7a26ac3f · 2013-04-17T14:13:02.000-04:00
The structure sctp_ulpq is embedded into sctp_association and never
separately allocated, also ulpq-&gt;malloced is always 0, so that
kfree() is never called. Therefore, remove this code.

Signed-off-by: Daniel Borkmann &lt;dborkman@redhat.com&gt;
Acked-by: Neil Horman &lt;nhorman@tuxdriver.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h
@@ -49,7 +49,6 @@
 
 /* A structure to carry information to the ULP (e.g. Sockets API) */
 struct sctp_ulpq {
-	char malloced;
 	char pd_mode;
 	struct sctp_association *asoc;
 	struct sk_buff_head reasm;
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
@@ -68,7 +68,6 @@ struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *ulpq,
 	skb_queue_head_init(&ulpq->reasm);
 	skb_queue_head_init(&ulpq->lobby);
 	ulpq->pd_mode  = 0;
-	ulpq->malloced = 0;
 
 	return ulpq;
 }
@@ -96,8 +95,6 @@ void sctp_ulpq_flush(struct sctp_ulpq *ulpq)
 void sctp_ulpq_free(struct sctp_ulpq *ulpq)
 {
 	sctp_ulpq_flush(ulpq);
-	if (ulpq->malloced)
-		kfree(ulpq);
 }
 
 /* Process an incoming DATA chunk.  */

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ struct sctp_ulpq sctp_ulpq_init(struct sctp_ulpq ulpq,`
`68`	`68`	`skb_queue_head_init(&ulpq->reasm);`
`69`	`69`	`skb_queue_head_init(&ulpq->lobby);`
`70`	`70`	`ulpq->pd_mode = 0;`
`71`		`- ulpq->malloced = 0;`
`72`	`71`
`73`	`72`	`return ulpq;`
`74`	`73`	`}`
`@@ -96,8 +95,6 @@ void sctp_ulpq_flush(struct sctp_ulpq *ulpq)`
`96`	`95`	`void sctp_ulpq_free(struct sctp_ulpq *ulpq)`
`97`	`96`	`{`
`98`	`97`	`sctp_ulpq_flush(ulpq);`
`99`		`- if (ulpq->malloced)`
`100`		`- kfree(ulpq);`
`101`	`98`	`}`
`102`	`99`
`103`	`100`	`/* Process an incoming DATA chunk. */`