Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp430587imu; Wed, 12 Dec 2018 20:41:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/XCxgt4O+LqJ25JGMKF/AUYusSKdFN6E7LHxyrW3u6KXQ7/F0TiMwvhwoirtfS2FTN9Ie+3 X-Received: by 2002:a17:902:bb05:: with SMTP id l5mr22769790pls.230.1544676105909; Wed, 12 Dec 2018 20:41:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676105; cv=none; d=google.com; s=arc-20160816; b=cFtBfGul8pB+p0jvZkw+9eQJU2eTBCNV5IM8yuRrpgq6/m5JdCVdnYPRuiCYahVfZ8 236nH32fKbYzgHUCPLmtOl4HqYNFEk4mQ/M5k05CGSFCK6I5/kWgkGXvQtj9Q+iZe59J iVnkv2PwWqLNb37vNsxldtG9KyNQg66idsFOFOi3uDVPeqDB802fNCbFa+C4t3K7+5mj TIYSN4O8Sms23HAszzgZ0gO9UdYRaAClWehgj6GWA3KOe/tKFU9wF+z8ZUO8rpUJCL1V EY2O4U2Fs83Uqb6jvmUx8Zn9ZvIfptDfQ1zJLuXHraqxydV3a9fAJkGi1JCupj+saOts OWXQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lXsALbhjg/QrQNXVJLoswL8nCLiKzXAubeAcVx4ATxw=; b=fjWzmqYMfX+EjLp909DLJGNBc5KoHa2aumEELfFxulvIUWY/wpvbMhR8//3b/qr/1k J0NJki2Gq7LRVcZfIWafp5dDesWeRQ25A8XUxIz4QBQzS/z56NBMRyUOwJ0Z07fqTJ45 xC4exBqyf6pGq2vC1ItAuJhCrHI7hTqk6gNOoV+mg44ZUmioWMtW8BEkTzffu8N3kjHw y447czmrjf/EdUGgmj5LwhJs7EAKY/u9hpaZLsPWR2If3zI2jDo5eI7xRg2K2eW3/SQR CZADQNQeEIxF6oLqVmPQmWnIEefFrJ9vfAvFLoPeWtpsMiyXJ68Oe08wePNnEx1gNmAS vsqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zRhT/6OH"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d16si714895plj.104.2018.12.12.20.41.31; Wed, 12 Dec 2018 20:41:45 -0800 (PST) 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="zRhT/6OH"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729232AbeLMEkp (ORCPT + 99 others); Wed, 12 Dec 2018 23:40:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:45192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729026AbeLMEcQ (ORCPT ); Wed, 12 Dec 2018 23:32:16 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4FF0C20873; Thu, 13 Dec 2018 04:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675536; bh=OQ4KDll6AVAiZX361qnS6dKsIvaMeFosM4YBMe/EC8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zRhT/6OHqLln9cw6FrPT9vIEoz745sO3PZMnfThfYKfyiakFIKq9TD7fRkTVbe4ZE H9cdSnleK26Zd1+2hOeHj4QT5DVtgNryJ2AHk3Ml0cCkbDZOoS6ZC491jilJKL3gI5 J7bygOLOlVc6o+KaVqd2lB7PMuiIvMK9T9ZifgkE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuck Lever , stable@kernel.org, Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 09/34] SUNRPC: Fix leak of krb5p encode pages Date: Wed, 12 Dec 2018 23:31:35 -0500 Message-Id: <20181213043200.76295-9-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213043200.76295-1-sashal@kernel.org> References: <20181213043200.76295-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuck Lever [ Upstream commit 8dae5398ab1ac107b1517e8195ed043d5f422bd0 ] 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: Sasha Levin --- net/sunrpc/auth_gss/auth_gss.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 16cea00c959b..591d378d1a18 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -1736,6 +1736,7 @@ priv_release_snd_buf(struct rpc_rqst *rqstp) 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 @@ -1744,6 +1745,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; -- 2.19.1