Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp821165pxb; Tue, 3 Nov 2020 13:30:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPvT6zgHNhhrt6IRStRZVrIurjXpgYofeqHpyWt/9VBvvBKR6wNWbeZtZRY6s2/QqT2pRL X-Received: by 2002:a17:906:c0ce:: with SMTP id bn14mr13001603ejb.105.1604439012345; Tue, 03 Nov 2020 13:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604439012; cv=none; d=google.com; s=arc-20160816; b=uz9S07sZrLQgi2alfc2MW++XOo7UknW/i4tJNSQSloknwqzOz9dWhFtcHbFsqnzmzy ZNdNsM+HikCnjcyUjfOCwuMkHJX90MaKXZ3q4UeRAmz8KmSf6qh+V1umunt0X34sLtET kYs/tAsJGQb0ykNWBGnpopOWIJHVBOW+j78fkKzBJRpdiwcJLMIZZcYza9pk5sVgMxSS LvAL7P5Zq7p8ihIL+xcaW69bqMlhZTKbu5YHYXcMuuXsYW0CfG1eN3xaIbSb2hoKwr2I khUC6kgCtkE2J/u2MQM3RyhUJ/LFuPpc6EoJ10Da1ZeLvfXB3n/AvH7ZufMbXiPpTi3P afdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=91ur3Oamc7rUx8YKZIw0A7pRvE+yhg1+hLkqxU7ytPc=; b=R99pFqDrOSoAV3flCEhFzUL4r4BVuvHVbaqsL+70bnPp/i3gqPaczPWg/rL67PCk2b fzN/AfoDx8esPF+XDB8olI8UxooNHRTm6vjLlQxfQfwWww9mdT1S5Utju+kQ2galaDiF 4JVdgZwb33lDMz7TppCwPCFsMbvBefM8qsKFAG5u3AzjLwAd9lZhuGKUF6HU+rqSYfZd 0hAHQ+cq7Sf9kjmt79QqyCw+tHS3HSjH58FiALcnvMgaoyAid7nMJ9fgq59tsn/rTY/d cz68xfS/MO3eG5pBXy4Im79hrKFd2R9HVBFVgClVCgWBNLOG2WfI9DFC5sKKjjfR+E5m WyPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="r/bNxaKS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dg22si10335019edb.414.2020.11.03.13.29.49; Tue, 03 Nov 2020 13:30:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="r/bNxaKS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387679AbgKCVZT (ORCPT + 99 others); Tue, 3 Nov 2020 16:25:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:40032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387689AbgKCVCs (ORCPT ); Tue, 3 Nov 2020 16:02:48 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 43E6020757; Tue, 3 Nov 2020 21:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437367; bh=cZasaFHorfZIMD7eZjxTI5wbamN/lj7yJaAygk5geDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r/bNxaKSs/DmGQc4apUjvIQ7wJvs+nD2WzyUUbQQeJeyj5S34rno+lOzNrxFUUTwu /c6BhOqhPejQPEdIoDziwoP45zXvRVTWSZH90nDmAjafxk62rgbOf7kT0lSG9/6k8t w3zLXV5r/Vgc3b9B0xA6vR08LDErF7PGTRszHXqY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vinay Kumar Yadav , Jakub Kicinski Subject: [PATCH 4.19 008/191] chelsio/chtls: fix memory leaks in CPL handlers Date: Tue, 3 Nov 2020 21:35:00 +0100 Message-Id: <20201103203233.749138343@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinay Kumar Yadav [ Upstream commit 6daa1da4e262b0cd52ef0acc1989ff22b5540264 ] CPL handler functions chtls_pass_open_rpl() and chtls_close_listsrv_rpl() should return CPL_RET_BUF_DONE so that caller function will do skb free to avoid leak. Fixes: cc35c88ae4db ("crypto : chtls - CPL handler definition") Signed-off-by: Vinay Kumar Yadav Link: https://lore.kernel.org/r/20201025194228.31271-1-vinay.yadav@chelsio.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls_cm.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) --- a/drivers/crypto/chelsio/chtls/chtls_cm.c +++ b/drivers/crypto/chelsio/chtls/chtls_cm.c @@ -696,14 +696,13 @@ static int chtls_pass_open_rpl(struct ch if (rpl->status != CPL_ERR_NONE) { pr_info("Unexpected PASS_OPEN_RPL status %u for STID %u\n", rpl->status, stid); - return CPL_RET_BUF_DONE; + } else { + cxgb4_free_stid(cdev->tids, stid, listen_ctx->lsk->sk_family); + sock_put(listen_ctx->lsk); + kfree(listen_ctx); + module_put(THIS_MODULE); } - cxgb4_free_stid(cdev->tids, stid, listen_ctx->lsk->sk_family); - sock_put(listen_ctx->lsk); - kfree(listen_ctx); - module_put(THIS_MODULE); - - return 0; + return CPL_RET_BUF_DONE; } static int chtls_close_listsrv_rpl(struct chtls_dev *cdev, struct sk_buff *skb) @@ -720,15 +719,13 @@ static int chtls_close_listsrv_rpl(struc if (rpl->status != CPL_ERR_NONE) { pr_info("Unexpected CLOSE_LISTSRV_RPL status %u for STID %u\n", rpl->status, stid); - return CPL_RET_BUF_DONE; + } else { + cxgb4_free_stid(cdev->tids, stid, listen_ctx->lsk->sk_family); + sock_put(listen_ctx->lsk); + kfree(listen_ctx); + module_put(THIS_MODULE); } - - cxgb4_free_stid(cdev->tids, stid, listen_ctx->lsk->sk_family); - sock_put(listen_ctx->lsk); - kfree(listen_ctx); - module_put(THIS_MODULE); - - return 0; + return CPL_RET_BUF_DONE; } static void chtls_purge_wr_queue(struct sock *sk)