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 5A8D9222D70; Thu, 12 Dec 2024 16:51:14 +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=1734022274; cv=none; b=bMXH0ZOFAUkMPuUUnWxtszZOZa2j07QxCaIe/ao/f2JS90RsZowiRz/LxFDNi1L47c26rfDjn5OX4a/20SaEuiRNd6Aa3ydBAHPflPJUdnCYJ1E/OgzG8z+Ia0MAB7t/HzIm/qSD055+WWSwaita72KiadnrmamFH93JViYTkbo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734022274; c=relaxed/simple; bh=rhB7AIkaUFnlgYSFqqaMfsXiuIqQif9v/MtQL3DqG3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FM5jdrmnZ2SvRQ6FgiJ7PQtbFms8dZ1nXVz4dT8vogc2jS30B1zC/NXngekNFI6YAFF5cNpXvWYKqyL1ZkkGAyo1vF2T4g42dRg1zPd0IVSEVxmh+BasnKpEAmKxioNPlv03Z019RHkbCSiP5T/IDpOju/sfOpNGGgOmZvXxVHE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hX6T5SJn; 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="hX6T5SJn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 276F4C4CECE; Thu, 12 Dec 2024 16:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734022273; bh=rhB7AIkaUFnlgYSFqqaMfsXiuIqQif9v/MtQL3DqG3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hX6T5SJnVzgjvf/fV1mabIfRVoCRC8zNpi/b9qdyhb5fkMUuLlCvifRRsnnJiTfiI 5fiQmno55bgKfspfdqoK5S601R03MtJtMuLY+CoZLGexSQPBcVMoUmBMRuBS0qxj8V xgETJAfekqWZdwfEkw7wM5nOThksIKB55ZzyHPGk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zijian Zhang , Martin KaFai Lau , Sasha Levin Subject: [PATCH 5.15 196/565] bpf, sockmap: Fix sk_msg_reset_curr Date: Thu, 12 Dec 2024 15:56:31 +0100 Message-ID: <20241212144319.234654469@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zijian Zhang [ Upstream commit 955afd57dc4bf7e8c620a0a9e3af3c881c2c6dff ] Found in the test_txmsg_pull in test_sockmap, ``` txmsg_cork = 512; // corking is importrant here opt->iov_length = 3; opt->iov_count = 1; opt->rate = 512; // sendmsg will be invoked 512 times ``` The first sendmsg will send an sk_msg with size 3, and bpf_msg_pull_data will be invoked the first time. sk_msg_reset_curr will reset the copybreak from 3 to 0. In the second sendmsg, since we are in the stage of corking, psock->cork will be reused in func sk_msg_alloc. msg->sg.copybreak is 0 now, the second msg will overwrite the first msg. As a result, we could not pass the data integrity test. The same problem happens in push and pop test. Thus, fix sk_msg_reset_curr to restore the correct copybreak. Fixes: bb9aefde5bba ("bpf: sockmap, updating the sg structure should also update curr") Signed-off-by: Zijian Zhang Link: https://lore.kernel.org/r/20241106222520.527076-9-zijianzhang@bytedance.com Signed-off-by: Martin KaFai Lau Signed-off-by: Sasha Levin --- net/core/filter.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 8b51f57aaa251..e35d86ba00e24 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2583,18 +2583,16 @@ BPF_CALL_2(bpf_msg_cork_bytes, struct sk_msg *, msg, u32, bytes) static void sk_msg_reset_curr(struct sk_msg *msg) { - u32 i = msg->sg.start; - u32 len = 0; - - do { - len += sk_msg_elem(msg, i)->length; - sk_msg_iter_var_next(i); - if (len >= msg->sg.size) - break; - } while (i != msg->sg.end); + if (!msg->sg.size) { + msg->sg.curr = msg->sg.start; + msg->sg.copybreak = 0; + } else { + u32 i = msg->sg.end; - msg->sg.curr = i; - msg->sg.copybreak = 0; + sk_msg_iter_var_prev(i); + msg->sg.curr = i; + msg->sg.copybreak = msg->sg.data[i].length; + } } static const struct bpf_func_proto bpf_msg_cork_bytes_proto = { -- 2.43.0