Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3294590pxf; Mon, 5 Apr 2021 08:19:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx92zTf24KV7Wqz/ZcXPvMt1yJl9CMKAT5dEYn0NTt8fG2x+CrsyBCiNpT4uzgzLdtTpl3S X-Received: by 2002:a02:9663:: with SMTP id c90mr24769687jai.16.1617635967670; Mon, 05 Apr 2021 08:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617635967; cv=none; d=google.com; s=arc-20160816; b=s06JnpRr3b8cWVlxWi7/A0e9450Ka7MfVhZHlK3n04ft6aqMTZWu6oOsv6U59TzaGm 5VsId4wErKVlX7QWdOALRsNThUhy02I892Ew1uYSM1gmO7+KzpdCiFTU2D5HdTWCORK9 kthNJKCdyKd9Ez7kVbRgPumnhnslgESQC+g3DPV2m4OrcXWxFp1Lg60uqSfeoR1upKMj rEjIE59UrxB/KhnvIBOlFOG+KUplZZVcqcgg6y5QF1LmCEmAD8TuNyhE0NaipcBYq7/6 GqBtg5+pytjs9FpZGguuUVydc7HKN/jOKlxPsq1N5X4cvLU01HZ7TT+UDwUzso1+GKOm eh4A== 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=crOh1lQA/qoYzPnX1xbmEMuFqvUMtHZcLfOD7zxLe5k=; b=UoEiI/3I5Olsjk2Yy40loWYl5y+SPGsESW/6n8ab2Rzp3pcNWPfTYG1oYgb0izCcvI 4mFbb4WGV0acWu3pR5DdAqv6VYh5U89UZUmAjeUDhzN3qPaWT2RyfQcKAz7p4ef05JBl IVbJ6ss9XczXUjRsipbdYlwbLreVQev9E8yw1+c6LN/8HfMZUoz4daOgls3wHM3Um+3+ NqEnBhb12ty6yUdLAJg1//0FYJh1eDqNV0VMerPhx7Y/YSUDyhGfGv4HhMwpnZyD6/+m 37z50APbhlW6esHhjqe199sOEWxn094En1iP0DXyzRkx+9Ja2BXE/c2M3M4HtWoZjmi8 O/sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lKUxAjPu; 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=pass (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 y10si16484917iow.59.2021.04.05.08.19.15; Mon, 05 Apr 2021 08:19:27 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=lKUxAjPu; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237945AbhDEJHH (ORCPT + 99 others); Mon, 5 Apr 2021 05:07:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238346AbhDEJEt (ORCPT ); Mon, 5 Apr 2021 05:04:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 939FE6138D; Mon, 5 Apr 2021 09:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613484; bh=8y83WUAbvKVetLpxAP99QkftMk9mzokKWMXolxKhLSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lKUxAjPu0nV81Vmte+lcO7r1OePr9DuP/EmpmOlqc8yQ+hREQCM2Ky251uP5eSQZg PnW1k3ecUoajTsAPtUEryJNb4gb14vJ6BZhyeZji3qZ2Ood+Ko4BATiAiZ0nDHi+RW ktTWr23kj7P9wliJacJbWTBXvormoRvCSqYf/P/I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "J. Bruce Fields" , Chuck Lever , Sasha Levin Subject: [PATCH 5.4 09/74] rpc: fix NULL dereference on kmalloc failure Date: Mon, 5 Apr 2021 10:53:33 +0200 Message-Id: <20210405085025.026111904@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085024.703004126@linuxfoundation.org> References: <20210405085024.703004126@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: J. Bruce Fields [ Upstream commit 0ddc942394013f08992fc379ca04cffacbbe3dae ] I think this is unlikely but possible: svc_authenticate sets rq_authop and calls svcauth_gss_accept. The kmalloc(sizeof(*svcdata), GFP_KERNEL) fails, leaving rq_auth_data NULL, and returning SVC_DENIED. This causes svc_process_common to go to err_bad_auth, and eventually call svc_authorise. That calls ->release == svcauth_gss_release, which tries to dereference rq_auth_data. Signed-off-by: J. Bruce Fields Link: https://lore.kernel.org/linux-nfs/3F1B347F-B809-478F-A1E9-0BE98E22B0F0@oracle.com/T/#t Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- net/sunrpc/auth_gss/svcauth_gss.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index cf4d6d7e7282..d5470c7fe879 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1782,11 +1782,14 @@ static int svcauth_gss_release(struct svc_rqst *rqstp) { struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; - struct rpc_gss_wire_cred *gc = &gsd->clcred; + struct rpc_gss_wire_cred *gc; struct xdr_buf *resbuf = &rqstp->rq_res; int stat = -EINVAL; struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id); + if (!gsd) + goto out; + gc = &gsd->clcred; if (gc->gc_proc != RPC_GSS_PROC_DATA) goto out; /* Release can be called twice, but we only wrap once. */ @@ -1827,10 +1830,10 @@ out_err: if (rqstp->rq_cred.cr_group_info) put_group_info(rqstp->rq_cred.cr_group_info); rqstp->rq_cred.cr_group_info = NULL; - if (gsd->rsci) + if (gsd && gsd->rsci) { cache_put(&gsd->rsci->h, sn->rsc_cache); - gsd->rsci = NULL; - + gsd->rsci = NULL; + } return stat; } -- 2.30.1