From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEDFC2DF73; Mon, 8 Apr 2024 13:08:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581689; cv=none; b=BI6R3C8eJPW5YBhpfMlJK2wGzQewNILFx+4kjEQmOWTg/X7qJ9ftk0pPM9dyg/uJDys9D87wcTrFJ5+aG3ttEEhcGQH5nvaSOUlPjOq2j0S2YcrwcK79L+/6cs/djp/AVQJTpE4GCsWOexUP7WKviRyTO2kZstItTvIcphl/P6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581689; c=relaxed/simple; bh=3Usgp80R/BtBJHiNBDci0RAyltHMk0FuXT7bzXO0WYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CrtukOHH/wrUmrxZhJD5KVV1OQfz3EV+RBwJE2S6KL5NbYDg1tI2IXST//ngmnbAjjP9qcvNcZVS8cal7uVC/SkvkwE98ZAAQ+LwcxMxnRdkUqiyJv7xnbNakBrjzj4TncGgZB6Yc32SQh8GvZC6TdEy6v0OF4sdtHTos3uOqWY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZLo6Wc4T; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZLo6Wc4T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74986C433F1; Mon, 8 Apr 2024 13:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712581688; bh=3Usgp80R/BtBJHiNBDci0RAyltHMk0FuXT7bzXO0WYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZLo6Wc4TY1rAvHBMT3fV0YWNzCzLAmuYXUIGou80YCisqlpbUM/QWwWFrSeW466Iz KThpqIRYc33y8J+nJnEamTMQ83uxF1QbINvrAQtq4RbcdNpqMXCma1byCdDfNyyG7F Peh8d9rJFBdEGOwlXRTXKnXqLkM6vdE9PZAQ72W4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sabrina Dubroca , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 029/252] tls: recv: process_rx_list shouldnt use an offset with kvec Date: Mon, 8 Apr 2024 14:55:28 +0200 Message-ID: <20240408125307.552064922@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sabrina Dubroca [ Upstream commit 7608a971fdeb4c3eefa522d1bfe8d4bc6b2481cc ] Only MSG_PEEK needs to copy from an offset during the final process_rx_list call, because the bytes we copied at the beginning of tls_sw_recvmsg were left on the rx_list. In the KVEC case, we removed data from the rx_list as we were copying it, so there's no need to use an offset, just like in the normal case. Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records") Signed-off-by: Sabrina Dubroca Reviewed-by: Simon Horman Link: https://lore.kernel.org/r/e5487514f828e0347d2b92ca40002c62b58af73d.1711120964.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/tls/tls_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index acf5bb74fd386..8e753d10e694a 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2152,7 +2152,7 @@ int tls_sw_recvmsg(struct sock *sk, } /* Drain records from the rx_list & copy if required */ - if (is_peek || is_kvec) + if (is_peek) err = process_rx_list(ctx, msg, &control, copied + peeked, decrypted - peeked, is_peek, NULL); else -- 2.43.0