Skip to content

Commit a10ae69

Browse files
author
CKI KWF Bot
committed
Merge: sctp: stable backport for 9.8 phase 2
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7418 JIRA: https://issues.redhat.com/browse/RHEL-115641 This MR backports important fixes from upstream for RHEL-9.8. Signed-off-by: Xin Long <lxin@redhat.com> Approved-by: Guillaume Nault <gnault@redhat.com> Approved-by: Paolo Abeni <pabeni@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents d8e20da + dca9883 commit a10ae69

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

net/sctp/ipv6.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,9 @@ static void sctp_v6_from_sk(union sctp_addr *addr, struct sock *sk)
547547
{
548548
addr->v6.sin6_family = AF_INET6;
549549
addr->v6.sin6_port = 0;
550+
addr->v6.sin6_flowinfo = 0;
550551
addr->v6.sin6_addr = sk->sk_v6_rcv_saddr;
552+
addr->v6.sin6_scope_id = 0;
551553
}
552554

553555
/* Initialize sk->sk_rcv_saddr from sctp_addr. */

net/sctp/socket.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9100,7 +9100,8 @@ static void __sctp_write_space(struct sctp_association *asoc)
91009100
wq = rcu_dereference(sk->sk_wq);
91019101
if (wq) {
91029102
if (waitqueue_active(&wq->wait))
9103-
wake_up_interruptible(&wq->wait);
9103+
wake_up_interruptible_poll(&wq->wait, EPOLLOUT |
9104+
EPOLLWRNORM | EPOLLWRBAND);
91049105

91059106
/* Note that we try to include the Async I/O support
91069107
* here by modeling from the current TCP/UDP code.

0 commit comments

Comments
 (0)