diff options
| -rw-r--r-- | net/sctp/socket.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 17841ab30798..6f45d1713452 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -170,6 +170,36 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk) | |||
| 170 | sk_mem_charge(sk, chunk->skb->truesize); | 170 | sk_mem_charge(sk, chunk->skb->truesize); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | static void sctp_clear_owner_w(struct sctp_chunk *chunk) | ||
| 174 | { | ||
| 175 | skb_orphan(chunk->skb); | ||
| 176 | } | ||
| 177 | |||
| 178 | static void sctp_for_each_tx_datachunk(struct sctp_association *asoc, | ||
| 179 | void (*cb)(struct sctp_chunk *)) | ||
| 180 | |||
| 181 | { | ||
| 182 | struct sctp_outq *q = &asoc->outqueue; | ||
| 183 | struct sctp_transport *t; | ||
| 184 | struct sctp_chunk *chunk; | ||
| 185 | |||
| 186 | list_for_each_entry(t, &asoc->peer.transport_addr_list, transports) | ||
| 187 | list_for_each_entry(chunk, &t->transmitted, transmitted_list) | ||
| 188 | cb(chunk); | ||
| 189 | |||
| 190 | list_for_each_entry(chunk, &q->retransmit, list) | ||
| 191 | cb(chunk); | ||
| 192 | |||
| 193 | list_for_each_entry(chunk, &q->sacked, list) | ||
| 194 | cb(chunk); | ||
| 195 | |||
| 196 | list_for_each_entry(chunk, &q->abandoned, list) | ||
| 197 | cb(chunk); | ||
| 198 | |||
| 199 | list_for_each_entry(chunk, &q->out_chunk_list, list) | ||
| 200 | cb(chunk); | ||
| 201 | } | ||
| 202 | |||
| 173 | /* Verify that this is a valid address. */ | 203 | /* Verify that this is a valid address. */ |
| 174 | static inline int sctp_verify_addr(struct sock *sk, union sctp_addr *addr, | 204 | static inline int sctp_verify_addr(struct sock *sk, union sctp_addr *addr, |
| 175 | int len) | 205 | int len) |
| @@ -8212,7 +8242,9 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, | |||
| 8212 | * paths won't try to lock it and then oldsk. | 8242 | * paths won't try to lock it and then oldsk. |
| 8213 | */ | 8243 | */ |
| 8214 | lock_sock_nested(newsk, SINGLE_DEPTH_NESTING); | 8244 | lock_sock_nested(newsk, SINGLE_DEPTH_NESTING); |
| 8245 | sctp_for_each_tx_datachunk(assoc, sctp_clear_owner_w); | ||
| 8215 | sctp_assoc_migrate(assoc, newsk); | 8246 | sctp_assoc_migrate(assoc, newsk); |
| 8247 | sctp_for_each_tx_datachunk(assoc, sctp_set_owner_w); | ||
| 8216 | 8248 | ||
| 8217 | /* If the association on the newsk is already closed before accept() | 8249 | /* If the association on the newsk is already closed before accept() |
| 8218 | * is called, set RCV_SHUTDOWN flag. | 8250 | * is called, set RCV_SHUTDOWN flag. |
