From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00B62C43381 for ; Fri, 8 Mar 2019 12:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5D5E20449 for ; Fri, 8 Mar 2019 12:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552049897; bh=ZPiwLeSFxRFc9jUfbflop2psPATvSUFHB5xu5sEYZG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=US8qLhJ6O+qe/5usyfj7vd6VjT9pbp6VCwM4GXG7TI79bpkTsemb/JqgPZckb/V+J W28OA9d6ToXkntqIymd/18p97e10JOFN3aFuTyaXhLST/Naa14geIaUORK7R0dfZCb lwVL6/Xcd5sDakKj+Ehgo0EfOjiAdTnvzqBrjfac= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727974AbfCHM6Q (ORCPT ); Fri, 8 Mar 2019 07:58:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:34550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727357AbfCHM6M (ORCPT ); Fri, 8 Mar 2019 07:58:12 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BB4CA20811; Fri, 8 Mar 2019 12:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552049891; bh=ZPiwLeSFxRFc9jUfbflop2psPATvSUFHB5xu5sEYZG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jlo5q2Mo8vE5IBaCgByrfC7OzGyUlBdGRXVVm3wePv/rGzMdPatIMCyPc1UxZxA5B 2KCm3wEZRlZ+XzMCEuDwakOHYYInGT1+/3LR8cdFe/zvNfDpeC8nO+tD4SmCBcniUH uDPYTjlsug0r3E8OFo2Cnu74jwKm/GLTuDMdvIF8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ying Xu , Xin Long , Neil Horman , "David S. Miller" Subject: [PATCH 4.19 19/68] sctp: call iov_iter_revert() after sending ABORT Date: Fri, 8 Mar 2019 13:49:49 +0100 Message-Id: <20190308124911.779678627@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190308124910.696595153@linuxfoundation.org> References: <20190308124910.696595153@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xin Long [ 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 Signed-off-by: Xin Long Acked-by: Neil Horman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 1 + 1 file changed, 1 insertion(+) --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1884,6 +1884,7 @@ static int sctp_sendmsg_check_sflags(str 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; }