Backport to 4.19 - sctp: fully support memory accounting
Subsystems (3)
cover Backport to 4.19 - sctp: fully support memory accounting
Backport below upstream commits to 4.19 to address CVE-2019-3874. 1033990ac5b2ab6cee93734cb6d301aa3a35bcaa
sctp: implement memory accounting on tx path
9dde27de3e5efa0d032f3c891a0ca833a0d31911
sctp: implement memory accounting on rx path
Xin Long (2):
sctp: implement memory accounting on tx path
sctp: implement memory accounting on rx path
include/net/sctp/sctp.h | 2 +- net/sctp/sm_statefuns.c | 6 ++++-- net/sctp/socket.c | 10 ++++++++-- net/sctp/ulpevent.c | 19 ++++++++----------- net/sctp/ulpqueue.c | 3 ++- 5 files changed, 23 insertions(+), 17 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 sctp: implement memory accounting on tx path
From: Xin Long <[email protected]>
commit 1033990ac5b2ab6cee93734cb6d301aa3a35bcaa upstream.
Now when sending packets, sk_mem_charge() and sk_mem_uncharge() have been used to set sk_forward_alloc. We just need to call sk_wmem_schedule() to check if the allocated should be raised, and call sk_mem_reclaim() to check if the allocated should be reduced when it's under memory pressure.
If sk_wmem_schedule() returns false, which means no memory is allowed to allocate, it will block and wait for memory to become available.
Note different from tcp, sctp wait_for_buf happens before allocating any skb, so memory accounting check is done with the whole msg_len before it too.
--- net/sctp/socket.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/sctp/socket.c +8 -2
@@ -1931,7 +1931,10 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc,if (sctp_wspace (asoc) < (int )msg_len)sctp_prsctp_prune (asoc, sinfo, msg_len -sctp_wspace (asoc)); -if (sctp_wspace (asoc) <=0 ) { +if (sk_under_memory_pressure (sk)) +sk_mem_reclaim (sk); + +if (sctp_wspace (asoc) <=0 || !sk_wmem_schedule (sk, msg_len)) { timeo =sock_sndtimeo (sk, msg->msg_flags &MSG_DONTWAIT ); err =sctp_wait_for_sndbuf (asoc, &timeo, msg_len);if (err)
@@ -8515,7 +8518,10 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, goto do_error;if (signal_pending (current)) goto do_interrupted; -if ((int )msg_len <=sctp_wspace (asoc)) +if (sk_under_memory_pressure (sk)) +sk_mem_reclaim (sk); +if ((int )msg_len <=sctp_wspace (asoc) && +sk_wmem_schedule (sk, msg_len))break ;/* Let another process have a go. Since we are going
Signature · 1 line
2.7.4
PATCH 2/2 sctp: implement memory accounting on rx path
In reply to ashwin-hFrom: Xin Long <[email protected]>
commit 9dde27de3e5efa0d032f3c891a0ca833a0d31911 upstream.
sk_forward_alloc's updating is also done on rx path, but to be consistent we change to use sk_mem_charge() in sctp_skb_set_owner_r().
In sctp_eat_data(), it's not enough to check sctp_memory_pressure only, which doesn't work for mem_cgroup_sockets_enabled, so we change to use sk_under_memory_pressure().
When it's under memory pressure, sk_mem_reclaim() and sk_rmem_schedule() should be called on both RENEGE or CHUNK DELIVERY path exit the memory pressure status as soon as possible.
Note that sk_rmem_schedule() is using datalen to make things easy there.
--- include/net/sctp/sctp.h | 2 +- net/sctp/sm_statefuns.c | 6 ++++-- net/sctp/ulpevent.c | 19 ++++++++----------- net/sctp/ulpqueue.c | 3 ++- 4 files changed, 15 insertions(+), 15 deletions(-)
include/net/sctp/sctp.h +1 -1
@@ -421,7 +421,7 @@ static inline void sctp_skb_set_owner_r(struct sk_buff *skb, struct sock *sk)/* * This mimics the behavior of skb_set_owner_r */ - sk->sk_forward_alloc -= event->rmem_len; +sk_mem_charge (sk, event->rmem_len); }/* Tests if the list has one and only one entry. */
net/sctp/sm_statefuns.c +4 -2
@@ -6444,13 +6444,15 @@ static int sctp_eat_data(const struct sctp_association *asoc,* in sctp_ulpevent_make_rcvmsg will drop the frame if we grow our * memory usage too much */ -if (*sk->sk_prot_creator->memory_pressure) { +if (sk_under_memory_pressure (sk)) {if (sctp_tsnmap_has_gap (map) && (sctp_tsnmap_get_ctsn (map) +1 ) == tsn) {pr_debug ("%s: under pressure, reneging for tsn:%u\n" , __func__, tsn); deliver =SCTP_CMD_RENEGE ; - } + }else { +sk_mem_reclaim (sk); + } }/*
net/sctp/ulpevent.c +8 -11
@@ -634,8 +634,9 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc, gfp_t gfp) {struct sctp_ulpevent *event =NULL ; -struct sk_buff *skb; -size_t padding, len; +struct sk_buff *skb = chunk->skb; +struct sock *sk = asoc->base.sk; +size_t padding, datalen;int rx_count;/*
@@ -646,15 +647,12 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,if (asoc->ep->rcvbuf_policy) rx_count =atomic_read (&asoc->rmem_alloc);else - rx_count =atomic_read (&asoc->base.sk->sk_rmem_alloc); + rx_count =atomic_read (&sk->sk_rmem_alloc); -if (rx_count >= asoc->base.sk->sk_rcvbuf) { + datalen =ntohs (chunk->chunk_hdr->length); -if ((asoc->base.sk->sk_userlocks &SOCK_RCVBUF_LOCK ) || - (!sk_rmem_schedule (asoc->base.sk, chunk->skb, - chunk->skb->truesize))) - goto fail; - } +if (rx_count >= sk->sk_rcvbuf || !sk_rmem_schedule (sk, skb, datalen)) + goto fail;/* Clone the original skb, sharing the data. */ skb =skb_clone (chunk->skb, gfp);
@@ -681,8 +679,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,* The sender should never pad with more than 3 bytes. The receiver * MUST ignore the padding bytes. */ - len =ntohs (chunk->chunk_hdr->length); - padding =SCTP_PAD4 (len) - len; + padding =SCTP_PAD4 (datalen) - datalen;/* Fixup cloned skb with just this chunks data. */ skb_trim (skb, chunk->chunk_end - padding - skb->data);
net/sctp/ulpqueue.c +2 -1
@@ -1106,7 +1106,8 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, freed +=sctp_ulpq_renege_frags (ulpq, needed - freed); }/* If able to free enough room, accept this chunk. */ -if (freed >= needed) { +if (sk_rmem_schedule (asoc->base.sk, chunk->skb, needed) && + freed >= needed) {int retval =sctp_ulpq_tail_data (ulpq, chunk, gfp);/* * Enter partial delivery if chunk has not been
Signature · 1 line
2.7.4
Quoted 11 lines · ashwin-h
Backport below upstream commits to 4.19 to address CVE-2019-3874.
1033990ac5b2ab6cee93734cb6d301aa3a35bcaa
sctp: implement memory accounting on tx path
9dde27de3e5efa0d032f3c891a0ca833a0d31911
sctp: implement memory accounting on rx pathXin Long (2):
sctp: implement memory accounting on tx path
sctp: implement memory accounting on rx path
Quoted 10 lines
include/net/sctp/sctp.h | 2 +- net/sctp/sm_statefuns.c | 6 ++++-- net/sctp/socket.c | 10 ++++++++-- net/sctp/ulpevent.c | 19 ++++++++----------- net/sctp/ulpqueue.c | 3 ++- 5 files changed, 23 insertions(+), 17 deletions(-)Signature · 1 line
2.7.4
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
Re: [PATCH 2/2] sctp: implement memory accounting on rx path
In reply to ashwin-hQuoted 24 lines · ashwin-h
From: Xin Long <[email protected]>
commit
9dde27de3e5efa0d032f3c891a0ca833a0d31911upstream.sk_forward_alloc's updating is also done on rx path, but to be consistent we change to use
sk_mem_charge()insctp_skb_set_owner_r().In
sctp_eat_data(), it's not enough to checksctp_memory_pressureonly, which doesn't work formem_cgroup_sockets_enabled, so we change to usesk_under_memory_pressure().When it's under memory pressure,
sk_mem_reclaim()andsk_rmem_schedule()should be called on both RENEGE or CHUNK DELIVERY path exit the memory pressure status as soon as possible.Note that
sk_rmem_schedule()is using datalen to make things easy there.Reported-by Matteo Croce <[email protected]>Tested-by Matteo Croce <[email protected]>Acked-by Neil Horman <[email protected]>Signed-off-by Xin Long <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Ashwin H <[email protected]>
Quoted 6 lines
--- include/net/sctp/sctp.h | 2 +- net/sctp/sm_statefuns.c | 6 ++++-- net/sctp/ulpevent.c | 19 ++++++++----------- net/sctp/ulpqueue.c | 3 ++- 4 files changed, 15 insertions(+), 15 deletions(-)
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
Re: [PATCH 1/2] sctp: implement memory accounting on tx path
In reply to ashwin-hQuoted 23 lines · ashwin-h
From: Xin Long <[email protected]>
commit
1033990ac5b2ab6cee93734cb6d301aa3a35bcaaupstream.Now when sending packets,
sk_mem_charge()andsk_mem_uncharge()have been used to setsk_forward_alloc. We just need to callsk_wmem_schedule()to check if the allocated should be raised, and callsk_mem_reclaim()to check if the allocated should be reduced when it's under memory pressure.If
sk_wmem_schedule()returns false, which means no memory is allowed to allocate, it will block and wait for memory to become available.Note different from tcp, sctp
wait_for_bufhappens before allocating any skb, so memory accounting check is done with the wholemsg_lenbefore it too.Reported-by Matteo Croce <[email protected]>Tested-by Matteo Croce <[email protected]>Acked-by Neil Horman <[email protected]>Signed-off-by Xin Long <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Ashwin H <[email protected]>
Quoted 3 lines
--- net/sctp/socket.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
SGkgRGF2aWQsDQoNCkNvdWxkIHlvdSBwbGVhc2UgbGV0IG1lIGtub3cgd2h5IHRoaXMgaXMgbm90 IGFwcGxpY2FibGUgdG8gNC4xOSA/DQoNClRoYW5rcywNCkFzaHdpbg0KDQrvu79PbiAwNi8wNS8y MCwgMTI6MDIgUE0sICJhc2h3aW4taCIgPGFzaHdpbmhAdm13YXJlLmNvbT4gd3JvdGU6DQoNCiAg ICBCYWNrcG9ydCBiZWxvdyB1cHN0cmVhbSBjb21taXRzIHRvIDQuMTkgdG8gYWRkcmVzcyBDVkUt MjAxOS0zODc0Lg0KICAgIDEwMzM5OTBhYzViMmFiNmNlZTkzNzM0Y2I2ZDMwMWFhM2EzNWJjYWEN CiAgICBzY3RwOiBpbXBsZW1lbnQgbWVtb3J5IGFjY291bnRpbmcgb24gdHggcGF0aA0KICAgIA0K ICAgIDlkZGUyN2RlM2U1ZWZhMGQwMzJmM2M4OTFhMGNhODMzYTBkMzE5MTENCiAgICBzY3RwOiBp bXBsZW1lbnQgbWVtb3J5IGFjY291bnRpbmcgb24gcnggcGF0aA0KICAgIA0KICAgIFhpbiBMb25n ICgyKToNCiAgICAgIHNjdHA6IGltcGxlbWVudCBtZW1vcnkgYWNjb3VudGluZyBvbiB0eCBwYXRo DQogICAgICBzY3RwOiBpbXBsZW1lbnQgbWVtb3J5IGFjY291bnRpbmcgb24gcnggcGF0aA0KICAg IA0KICAgICBpbmNsdWRlL25ldC9zY3RwL3NjdHAuaCB8ICAyICstDQogICAgIG5ldC9zY3RwL3Nt X3N0YXRlZnVucy5jIHwgIDYgKysrKy0tDQogICAgIG5ldC9zY3RwL3NvY2tldC5jICAgICAgIHwg MTAgKysrKysrKystLQ0KICAgICBuZXQvc2N0cC91bHBldmVudC5jICAgICB8IDE5ICsrKysrKysr LS0tLS0tLS0tLS0NCiAgICAgbmV0L3NjdHAvdWxwcXVldWUuYyAgICAgfCAgMyArKy0NCiAgICAg NSBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkNCiAgICAN CiAgICAtLSANCiAgICAyLjcuNA0KICAgIA0KICAgIA0KDQo
David Miller
maintainerFrom: Ashwin H <[email protected]>
Date: Fri, 8 May 2020 17:24:40 +0000
Quoted 1 line
Could you please let me know why this is not applicable to 4.19 ?
No, I cannot. I only handle the most recent two -stable releases, and 4.19 is beyond that.
Thank you.