summaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorXin Long2019-03-03 09:50:26 +0100
committerGreg Kroah-Hartman2019-03-10 07:17:17 +0100
commit8085d6d03fe3702e9cf37fff3677c08b40b1007f (patch)
treebd781b4b16b321bd629c5fb9dfedf90d25a122d6 /net/sctp
parentqmi_wwan: Add support for Quectel EG12/EM12 (diff)
downloadkernel-qcow2-linux-8085d6d03fe3702e9cf37fff3677c08b40b1007f.tar.gz
kernel-qcow2-linux-8085d6d03fe3702e9cf37fff3677c08b40b1007f.tar.xz
kernel-qcow2-linux-8085d6d03fe3702e9cf37fff3677c08b40b1007f.zip
sctp: call iov_iter_revert() after sending ABORT
[ Upstream commit 901efe12318b1ea8d3e2c88a7b75ed6e6d5d7245 ] The user msg is also copied to the abort packet when doing SCTP_ABORT in sctp_sendmsg_check_sflags(). When SCTP_SENDALL is set, iov_iter_revert() should have been called for sending abort on the next asoc with copying this msg. Otherwise, memcpy_from_msg() in sctp_make_abort_user() will fail and return error. Fixes: 4910280503f3 ("sctp: add support for snd flag SCTP_SENDALL process in sendmsg") Reported-by: Ying Xu <yinxu@redhat.com> Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index e5e70cff5bb3..1b16250c5718 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1884,6 +1884,7 @@ static int sctp_sendmsg_check_sflags(struct sctp_association *asoc,
pr_debug("%s: aborting association:%p\n", __func__, asoc);
sctp_primitive_ABORT(net, asoc, chunk);
+ iov_iter_revert(&msg->msg_iter, msg_len);
return 0;
}