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=ham 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 40D63C432C0 for ; Tue, 3 Dec 2019 22:44:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 084072084B for ; Tue, 3 Dec 2019 22:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413082; bh=DX3MlaJR24u347KXFwaZUu2joPNmxXCZOAJEq0+M8AE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UKMSKgjNffV6ygCmRmpEtFcZk9MmA0qAm25voDt6dXWHoI2H0p8mkd7EPgvpj+qET HgwKthbAnq5eTubtOIF36CG+RotQwZvXOA86DrByL+tRqMsnxfyqx7qtKYqv9HPkr4 B43ALCMEgY71MoyVumMxC+vF/9EbOXsvWzXLNq8Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728958AbfLCWok (ORCPT ); Tue, 3 Dec 2019 17:44:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:60740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728484AbfLCWoh (ORCPT ); Tue, 3 Dec 2019 17:44:37 -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 F01CE20803; Tue, 3 Dec 2019 22:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413076; bh=DX3MlaJR24u347KXFwaZUu2joPNmxXCZOAJEq0+M8AE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rKwgIbk7AQ8ces+yi8Vxl7NJumHYCs7YtmelPmr2qxK9Y9p67UCYsAbk9cbLS1YP+ 5dZB6wsy+y4isLNTgoin72wu4LSwMzuWu43gU3jT6z+/Ki71sn5kj6LHeSUMchcdEx 37HhMuf+xc3MOy1noJSAP63/WmmqTPKMv+/jqiMM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+df0d4ec12332661dd1f9@syzkaller.appspotmail.com, Jakub Kicinski , Simon Horman , John Fastabend , "David S. Miller" Subject: [PATCH 5.3 123/135] net/tls: free the record on encryption error Date: Tue, 3 Dec 2019 23:36:03 +0100 Message-Id: <20191203213044.695046895@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 d10523d0b3d78153ee58d19853ced26c9004c8c4 ] When tls_do_encryption() fails the SG lists are left with the SG_END and SG_CHAIN marks in place. One could hope that once encryption fails we will never see the record again, but that is in fact not true. Commit d3b18ad31f93 ("tls: add bpf support to sk_msg handling") added special handling to ENOMEM and ENOSPC errors which mean we may see the same record re-submitted. As suggested by John free the record, the BPF code is already doing just that. Reported-by: syzbot+df0d4ec12332661dd1f9@syzkaller.appspotmail.com Fixes: d3b18ad31f93 ("tls: add bpf support to sk_msg handling") Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman Acked-by: John Fastabend Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/tls/tls_sw.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -766,8 +766,14 @@ static int bpf_exec_tx_verdict(struct sk policy = !(flags & MSG_SENDPAGE_NOPOLICY); psock = sk_psock_get(sk); - if (!psock || !policy) - return tls_push_record(sk, flags, record_type); + if (!psock || !policy) { + err = tls_push_record(sk, flags, record_type); + if (err) { + *copied -= sk_msg_free(sk, msg); + tls_free_open_rec(sk); + } + return err; + } more_data: enospc = sk_msg_full(msg); if (psock->eval == __SK_NONE) {