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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 06F4BC432C0 for ; Tue, 3 Dec 2019 23:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB85D207DD for ; Tue, 3 Dec 2019 23:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575414534; bh=stNeFF6eYSL12Hwp4UCDFutVjOAtlzu0FO++CF2jli0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sCoIEnGQ9BgIfeXEDnWnpbyaLanWtQlpkyOyLlzPc0R6eKYpP6nsIeX9PDgE6EeLF 6SPMcPR6aySW3uIO1e0dokjg9xz9KEz6PhSZyKlqN+KaC9e2aNoms09uDVgeVLhPCU d0YGIdB/iqqM9goFlBk013M6tM2GKG6NkGJNeQlY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729009AbfLCWpK (ORCPT ); Tue, 3 Dec 2019 17:45:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:33394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728715AbfLCWpF (ORCPT ); Tue, 3 Dec 2019 17:45:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 87C62207DD; Tue, 3 Dec 2019 22:45:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413105; bh=stNeFF6eYSL12Hwp4UCDFutVjOAtlzu0FO++CF2jli0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nplOTDetVVa5wDcdGz+23nGUWeDjgUNU9GAKnyOiXrxPCePiCVrrLWEuC34bW1KlN jpuDc5o+SdDDzLBEaV4Ye5rORLN1n9j46LKAXnSCaygp9cGOeOdeZYkH0k0bHvKPq+ 66LlYn17a6bNZ5jSuk2dRLgEvvOWREf6zmd93a6Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Simon Horman , "David S. Miller" Subject: [PATCH 5.3 127/135] net/tls: use sg_next() to walk sg entries Date: Tue, 3 Dec 2019 23:36:07 +0100 Message-Id: <20191203213045.174759174@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Jakub Kicinski [ Upstream commit c5daa6cccdc2f94aca2c9b3fa5f94e4469997293 ] Partially sent record cleanup path increments an SG entry directly instead of using sg_next(). This should not be a problem today, as encrypted messages should be always allocated as arrays. But given this is a cleanup path it's easy to miss was this ever to change. Use sg_next(), and simplify the code. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/tls.h | 2 +- net/tls/tls_main.c | 13 ++----------- net/tls/tls_sw.c | 3 ++- 3 files changed, 5 insertions(+), 13 deletions(-) --- a/include/net/tls.h +++ b/include/net/tls.h @@ -407,7 +407,7 @@ int tls_push_sg(struct sock *sk, struct int flags); int tls_push_partial_record(struct sock *sk, struct tls_context *ctx, int flags); -bool tls_free_partial_record(struct sock *sk, struct tls_context *ctx); +void tls_free_partial_record(struct sock *sk, struct tls_context *ctx); static inline struct tls_msg *tls_msg(struct sk_buff *skb) { --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -208,24 +208,15 @@ int tls_push_partial_record(struct sock return tls_push_sg(sk, ctx, sg, offset, flags); } -bool tls_free_partial_record(struct sock *sk, struct tls_context *ctx) +void tls_free_partial_record(struct sock *sk, struct tls_context *ctx) { struct scatterlist *sg; - sg = ctx->partially_sent_record; - if (!sg) - return false; - - while (1) { + for (sg = ctx->partially_sent_record; sg; sg = sg_next(sg)) { put_page(sg_page(sg)); sk_mem_uncharge(sk, sg->length); - - if (sg_is_last(sg)) - break; - sg++; } ctx->partially_sent_record = NULL; - return true; } static void tls_write_space(struct sock *sk) --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2086,7 +2086,8 @@ void tls_sw_release_resources_tx(struct /* Free up un-sent records in tx_list. First, free * the partially sent record if any at head of tx_list. */ - if (tls_free_partial_record(sk, tls_ctx)) { + if (tls_ctx->partially_sent_record) { + tls_free_partial_record(sk, tls_ctx); rec = list_first_entry(&ctx->tx_list, struct tls_rec, list); list_del(&rec->list);