From patchwork Mon Jan 29 21:30:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magali Lemes X-Patchwork-Id: 1892510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TP1gd4NBKz23gZ for ; Tue, 30 Jan 2024 08:30:52 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rUZDC-0001AB-Cu; Mon, 29 Jan 2024 21:30:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rUZD8-00019R-2m for kernel-team@lists.ubuntu.com; Mon, 29 Jan 2024 21:30:34 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A865B3F10B for ; Mon, 29 Jan 2024 21:30:32 +0000 (UTC) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1d8cd8315fbso20835085ad.1 for ; Mon, 29 Jan 2024 13:30:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706563830; x=1707168630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CPmZRFB42AyibOsNS2oGRPvFEUUTsyqw9YsM16qVq7A=; b=RN6FDKp4dZ2rNy1OEW1DqMt5oZp7GdKG9H+oDFD4RUmrF7763O7wPlFQMnpLRUQ2Ai RMYon1qEt9CRR51gEXTst4BFsgBJwhWFMGfw/HdW3cVBKmRUiXw4IRPWWE71CqoVjH2c ZtqCHauiZpN1n4OHKKIZBVoVgdYIp42ydwGCpCFtOiUVplAyTZKxdKK+dLThgYarFbVM mrBy+Wp9/r5GbjQTraLng5sEqELkKtIZzKZJzLWUqwR9cM3M5m4LD7gJmm8BWVA+x8tP pplyZYSlB/oIBWItnHg2N6BrPGwGRfDZQxISYThKyyjQO+M6DDaLVj3P9tCycm+A/nok Dj8Q== X-Gm-Message-State: AOJu0Yzb/jBPl+Mvt4fq8VxgrDjRt02Acb+cThlv6qxNcc1qoznbsqT9 BLhBoNGdd2YjIV/8ZjbE3VNowG7l6EUMTEuq2uhgcHr0VrAaXKhclaqKuBqgKLTyG7yBKLHnZzV Da5DrRxpqZLKO8PQ0BkZxJER/VowQLLZsoXeoTkbhyOn8Q783drm7yVPuKCN6ADPvTXDt1hxucM AfCQaL/YSWqw== X-Received: by 2002:a17:903:2b0e:b0:1d8:d899:f1b with SMTP id mc14-20020a1709032b0e00b001d8d8990f1bmr5482471plb.28.1706563830308; Mon, 29 Jan 2024 13:30:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnhZRD/dKzJlANuVYsl7aqXQnRgHcANKOrRdcJc/IC/HuxOjEhJE/IsObwDh3uiwbqfzMH/g== X-Received: by 2002:a17:903:2b0e:b0:1d8:d899:f1b with SMTP id mc14-20020a1709032b0e00b001d8d8990f1bmr5482439plb.28.1706563829840; Mon, 29 Jan 2024 13:30:29 -0800 (PST) Received: from magali.. ([2804:7f0:b440:2053:7a31:e74a:7bf0:4d85]) by smtp.gmail.com with ESMTPSA id y18-20020a170902e19200b001d8e91e1634sm1944699pla.244.2024.01.29.13.30.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 13:30:28 -0800 (PST) From: Magali Lemes To: kernel-team@lists.ubuntu.com Subject: [SRU][F/J][PATCH 1/1] net: tls, update curr on splice as well Date: Mon, 29 Jan 2024 18:30:22 -0300 Message-Id: <20240129213023.1228125-2-magali.lemes@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240129213023.1228125-1-magali.lemes@canonical.com> References: <20240129213023.1228125-1-magali.lemes@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: John Fastabend commit c5a595000e2677e865a39f249c056bc05d6e55fd upstream. The curr pointer must also be updated on the splice similar to how we do this for other copy types. Fixes: d829e9c4112b ("tls: convert to generic sk_msg interface") Signed-off-by: John Fastabend Reported-by: Jann Horn Link: https://lore.kernel.org/r/20231206232706.374377-2-john.fastabend@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman (cherry picked from commit ba5efd8544fa62ae85daeb36077468bf2ce974ab linux-5.15.y) CVE-2024-0646 Signed-off-by: Magali Lemes --- net/tls/tls_sw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 101d231c1b61..9ff3e4df2d6c 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1216,6 +1216,8 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page, } sk_msg_page_add(msg_pl, page, copy, offset); + msg_pl->sg.copybreak = 0; + msg_pl->sg.curr = msg_pl->sg.end; sk_mem_charge(sk, copy); offset += copy;