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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 82683C07E85 for ; Tue, 11 Dec 2018 16:16:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A17820851 for ; Tue, 11 Dec 2018 16:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544544974; bh=Rm621VhDW06bR0fyDrPcGFwDsO1Zjq9+ee0uMsx2R9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dMEsbO63q72eQ54Z+PaNGW9rp/5oEJVIJwk+D65ZdNSswX1nmTtZLJvF6Q+JilyzW 8b0wgrM8hejvIdnmyP9ZzWTfTMli3Jmtqipx4hTtEw9Q9/Ql15+AvlHPXqWl/hzmJO PCIo9xnYar8kUHIOq0u6KnClEQUrO4lgpi9AWpR0= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A17820851 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728727AbeLKPsG (ORCPT ); Tue, 11 Dec 2018 10:48:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:36392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728213AbeLKPsA (ORCPT ); Tue, 11 Dec 2018 10:48:00 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 7FA202133F; Tue, 11 Dec 2018 15:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543280; bh=Rm621VhDW06bR0fyDrPcGFwDsO1Zjq9+ee0uMsx2R9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJS0zLKUdvc7WvMOf6VEJzIrCxc7mYOLi1gwItft8IxZjI74GjB10ECCgiPItaWan bzNxqx47sWjaWjuZxMNm3QTqCGN3fQH+KLS/PQJfcGmisYCmGyWQKWXeeCTBK4zVkF OBECmNJoTx6nX7wq3naxzmUMxgn+r6yx2FB12k7I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuck Lever , stable@kernel.org, Trond Myklebust Subject: [PATCH 4.4 80/91] SUNRPC: Fix leak of krb5p encode pages Date: Tue, 11 Dec 2018 16:41:39 +0100 Message-Id: <20181211151613.183132224@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151606.026852373@linuxfoundation.org> References: <20181211151606.026852373@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit 8dae5398ab1ac107b1517e8195ed043d5f422bd0 upstream. call_encode can be invoked more than once per RPC call. Ensure that each call to gss_wrap_req_priv does not overwrite pointers to previously allocated memory. Signed-off-by: Chuck Lever Cc: stable@kernel.org Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/auth_gss/auth_gss.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -1722,6 +1722,7 @@ priv_release_snd_buf(struct rpc_rqst *rq for (i=0; i < rqstp->rq_enc_pages_num; i++) __free_page(rqstp->rq_enc_pages[i]); kfree(rqstp->rq_enc_pages); + rqstp->rq_release_snd_buf = NULL; } static int @@ -1730,6 +1731,9 @@ alloc_enc_pages(struct rpc_rqst *rqstp) struct xdr_buf *snd_buf = &rqstp->rq_snd_buf; int first, last, i; + if (rqstp->rq_release_snd_buf) + rqstp->rq_release_snd_buf(rqstp); + if (snd_buf->page_len == 0) { rqstp->rq_enc_pages_num = 0; return 0;