Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp432720imu; Wed, 12 Dec 2018 20:45:30 -0800 (PST) X-Google-Smtp-Source: AFSGD/U14f32gcKAAZYeLC5k0+4KuaYyNQqlOMm7PwqAxLcOYWf2o1mqUmNxAtQdWVt5oC533Y/J X-Received: by 2002:a63:68c4:: with SMTP id d187mr20402965pgc.11.1544676330919; Wed, 12 Dec 2018 20:45:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676330; cv=none; d=google.com; s=arc-20160816; b=S+c2G9Jkf/zb2VXNaqGywCIgmL5jtzVp5DPMUoJhgx64XvjwAaLUOMaYcgR6e476bz YdUxnKwgFhoTqKvl4HNTTOcmx0s0Xh5k40vW9VeehJICPcYC89cKYytpyTfQg4+41c9I fdXOhZd5zFYHaNZBJcNbsqjOJzEKyN2/HQpkau0eQ/fh2x4QA7LZp5RvGLwHm8Tyi3mY Zf3+NX3JcLa4Rsq3I1MDq58IiB8cz3mhtD4Dl/MpHUfOgRwg6L7DXA78cwZ+MiZszJ+2 bk5cTU2cnlnlRLOFf89jJCc5ehVZxbbqSB1V7UljmfFdFWK0yBotg2U6NhE7MZ/n7WXd TRkA== 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=crmyscE6t0wJobx5QGZKqsS2MJIjnY+BOo0kJoyIOKw=; b=OmnFbSW7ckivJfrHxkFjsNFuar65ZJnnjfYn1T2NmZ/FMgeLvfUVg61sywlbbxxhgY 6yhMjZEAqFs4vB/wiqqbrylGBG/jClHSGQsBv9uc9Av3BEwHJizlw5yddBWYfnMgPrw6 7laM7PQMOB0kxtymfEcvwho98AgaF4e/4mkTRVtC8aVdMOmKHMPwpV9954bD7+R56lTy M1d6d7iquMGbOmR3npP7eiXsDbkK8uKvm3wkZFUzhatdYccsT9RGJg7krhgX9cz0kz4P Pqg4KcmltxdDRZqMDCVRY0vDmdTaSD1XjSogWiIgHviKtLToASkgjH17e/zD4v5nEeFO o13Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jqF5XQ8D; 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 p11si638112pgb.219.2018.12.12.20.45.16; Wed, 12 Dec 2018 20:45:30 -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=jqF5XQ8D; 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 S1728707AbeLMEbU (ORCPT + 99 others); Wed, 12 Dec 2018 23:31:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:44028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728652AbeLMEbM (ORCPT ); Wed, 12 Dec 2018 23:31:12 -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 92F7E20873; Thu, 13 Dec 2018 04:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675471; bh=9kzaQpxtP+bjm9z3urHk5tq1rRPjRSdkROWqMnScT5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jqF5XQ8DZXN010cRkEOMYLN23YCggGAjCo4nXdWbsX6ILdBxU4Z5BxZw74rNOxvHP scrQzeGD6A6ykh+IQk+/IMBo5P7oRu+XxovWpo9NBdC5xQmhprTg5MEgy2HneDghZY y0LzvdINz040GOz+uCU8O+htOvnGTSuaCpiAFL50= 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.14 11/41] SUNRPC: Fix leak of krb5p encode pages Date: Wed, 12 Dec 2018 23:30:24 -0500 Message-Id: <20181213043054.75891-11-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213043054.75891-1-sashal@kernel.org> References: <20181213043054.75891-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 9463af4b32e8..1281b967dbf9 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