Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp456455yba; Wed, 15 May 2019 04:25:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7R3mcbUpZG0WMiDUEXBbJh1VNTdd3+oYk6WhNbPN60alHjUFyJeweDNSr6ToAItWZxcXc X-Received: by 2002:a17:902:2a07:: with SMTP id i7mr44859723plb.125.1557919552427; Wed, 15 May 2019 04:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557919552; cv=none; d=google.com; s=arc-20160816; b=sJK5es3u8I8UXwWiMXLtINzoCNV3jpR2+69FBexiPRctqASTvX6LMD5qH6aeLIGPq6 qjcoxtYC4d79fVNCfB1WLu50dCSZRxxS7rTvWYzD44oLaJbR874wYp9BUV3yMoKIsSah 1NEdUhZpzFTPrkmkld2OHBbT6rbZoMfI2LGRljxayoC4imDqFHfyulbZHy2WcCGPvRk9 vHECU5KbkhMR2xE0scOMD9Mb/4UHTv1QTUPshfY6Qhe4TAXHyL4nkCSRZOEvD0Ox8isH 5OKg8ojekiYvoi8wI1QQLJsVrzMlaFOOYA8FhVy8Nd4XpoZHF4U7RlIaNMlPRmv14jYe SshA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Is3xcx4m+y2S1AfRGrc3VI7jT8KjxQYEYjCIdAVjaxM=; b=BGQKkcZezuF10jhl4E9R+xxl9xPaSWj1wv9qoeqUrW0cba1j5ZO2n3Tug/B2l3PvWj 0fhxFw5PzbZvDyYD0+rJDqddNIuaY9wjW63YtrHpxVBN2Szbk21Lupcc6erN4J+cBXxU TbNDJVd4OEI3QgDSeXnErQKa3Gz2wgZnCbzyea2bwETaXClmHnV9/04mBtCrHkpLT9uS szHf6dYviJqpnVGOdiinLgQ52q+jmQAoD6mM2/ev8Vf+/YDLqmjlqljmvwkAOIJ/MDXb detgyPZFPtb96uay1/jzVMH7SP1GGhgvHg4t5dva8vsqLXzwmSIFofGF2QQH6q/HZ2d8 BDKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gjCvmh1F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c38si1577911pgl.185.2019.05.15.04.25.37; Wed, 15 May 2019 04:25:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gjCvmh1F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730360AbfEOLYL (ORCPT + 99 others); Wed, 15 May 2019 07:24:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:34648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731286AbfEOLYH (ORCPT ); Wed, 15 May 2019 07:24:07 -0400 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 BF51A206BF; Wed, 15 May 2019 11:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919446; bh=GfhtyttpR9e4STYqhRJbAfPWRn+8c4aYPgYsUzV6DzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gjCvmh1FkE3nyVJeq2b+CPaMmJH5d0evTmbtYdpfPgC8CaTyrSOZaFyp0twaZiy7z TEVIZq/criTlRp/iZXIAi5nWHnnO8ylnKBoLKawe/Lyh/AlfXZUKxJ3b2AElXZjKeF FUUTIFv1IwzDYmODok6hykPti38NZyoIssGLdRic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Dirk van der Merwe , Simon Horman , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 077/113] net/tls: fix the IV leaks Date: Wed, 15 May 2019 12:56:08 +0200 Message-Id: <20190515090659.425348533@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090652.640988966@linuxfoundation.org> References: <20190515090652.640988966@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 [ Upstream commit 5a03bc73abed6ae196c15e9950afde19d48be12c ] Commit f66de3ee2c16 ("net/tls: Split conf to rx + tx") made freeing of IV and record sequence number conditional to SW path only, but commit e8f69799810c ("net/tls: Add generic NIC offload infrastructure") also allocates that state for the device offload configuration. Remember to free it. Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure") Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/tls/tls_device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index f4a19eac975db..fdf22cb0b3e6b 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -52,8 +52,11 @@ static DEFINE_SPINLOCK(tls_device_lock); static void tls_device_free_ctx(struct tls_context *ctx) { - if (ctx->tx_conf == TLS_HW) + if (ctx->tx_conf == TLS_HW) { kfree(tls_offload_ctx_tx(ctx)); + kfree(ctx->tx.rec_seq); + kfree(ctx->tx.iv); + } if (ctx->rx_conf == TLS_HW) kfree(tls_offload_ctx_rx(ctx)); -- 2.20.1