Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp436370imu; Wed, 12 Dec 2018 20:52:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/WFoUR/5rW+K9OqptKMAUT8rO8xE9FkTGERgNlLO9J9MMOFWB0dA5IDflEjtLpitwoWuiRB X-Received: by 2002:a63:e348:: with SMTP id o8mr20281817pgj.158.1544676724494; Wed, 12 Dec 2018 20:52:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676724; cv=none; d=google.com; s=arc-20160816; b=ywXb160PI8o0oipZKpOM0afKNm1X5bYvqo5DI0WebnTsZYD9/Oa7WSBSrA/pN7qCos JGdT68Lm61W+7ZougrRulMTKm452J1kYCAVi+XYfxnKycyd5pQmC247I0ZuN/PU9WHD5 9FAUDYGhiQTt98Dysf8XPYdKOApio46d6jFEat2OsUFJlWnr0diAHi61+5MrF5C19zRZ kI7PLC6iUs+MHsCemUF9L5HhngiLsbRW6BUd9+pWJhlRIUr0qOfV0u1H9m9yvRifv+rl hYT3rW8jEEfICehs/50J0mXw8yNEEUjkX413L8h+Ht3vVbfTR1/lQJTOtPVcNz6MeaO9 X8qg== 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=CybONanEDZTe+DE8H1WlIGCjWbfSVXmsj1HMq1HDqCE=; b=lsbuwP6/I/2nNAs5zKzQ2xlwpwLTO8sNZMhlqT28kRXZgMIFBdNsTZ06hMLnB1nELH VatJfs8Cp4inUh8tCrN7BC1aqiFlx8xuj8KpkFLrksEspCSlbSg4+BEhOQr5dAK6AJCu Ol7cVOZ0TmpiojpgtdZdfdRY4/GmcFmNZIPgIWVBDL3GXGoCZ+LTTcJT/99uLT/g+FnM MNk/8jvWtDAzGaEjKcgWQSZYK21NvyyTbvDxGL+ARdZFj6z2+lLSSr19p+WGgWm4r1Lu w9Z0xOiC6x+vkV4Z0g6BeZJr7RRLkoVUwx4tmJUAjKfmCQgQ3vJjXuBAkTezWy9lQrGe qrZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nRBDQnKT; 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 j34si634258pgj.557.2018.12.12.20.51.49; Wed, 12 Dec 2018 20:52:04 -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=nRBDQnKT; 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 S1727640AbeLME3Y (ORCPT + 99 others); Wed, 12 Dec 2018 23:29:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:42400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726630AbeLME3V (ORCPT ); Wed, 12 Dec 2018 23:29:21 -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 457E720879; Thu, 13 Dec 2018 04:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675361; bh=g0t6f1QjG/vLEXiwz3AkgARWIEdsdO8eFX6F9Hsk9bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nRBDQnKTFagt9cuOj4O5vbYE95llr9MGUnN45E/WeezeRxwL60CdbMy7ukmlJDQXO /p/7mmAUDNF+xwHiIGhQrORcknYbvQGnfWPg231kWgQ2Jr1ukE8eudsmWZ2kdyHyL1 C8XHeb1EMI6jdbLFzmBeAMTKnd5YkOtlGnL/Vbkg= 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.19 26/73] SUNRPC: Fix leak of krb5p encode pages Date: Wed, 12 Dec 2018 23:27:51 -0500 Message-Id: <20181213042838.75160-26-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-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 21c0aa0a0d1d..8cb7d812ccb8 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -1768,6 +1768,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 @@ -1776,6 +1777,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