Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3097195pxf; Mon, 5 Apr 2021 03:10:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzo1QRdXmgUxrvB/6UjxRnYNMOmBiIw/DPkCoJA/UWbosV1ygBAgifGU52MYRQomKBZFrbw X-Received: by 2002:aa7:c5d0:: with SMTP id h16mr30522778eds.380.1617617452981; Mon, 05 Apr 2021 03:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617617452; cv=none; d=google.com; s=arc-20160816; b=sVqjtmDjv9wXJjIKgNZfL5vlidW3brgzrKiplwHYKUz0o8E2EWITpgyCv9VNWOAHmK kgdBu57Kw8Q0MOJvmHqEMmWxjTp1L/+lNv3+eaJ9TOzDkyt2H8WZ7FxgROWxNij1vMYC Cq/lNPcPKv1PfE/MnSBkuI7aNVN8zpvwjK/oUOTlXIdywG29+LdgJ+dl8pSGKw/IJHmk DpJFTZK09W0an+Z3O3DN7LhTPNBP9CSIJieHREsqFRfdcNoUw43QW+j0R+PN1rORK6Sj 6gOrR2oRVMLfyZXkjyzAJUB+HTkx6CjdvStp0mDw7D2+S7FHnzsTStSzLTkCZl21nEob B+JA== 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=KgZ50CxPtcxIrJzmDrYZIjamGmxoVi/sydNx+T7+maU=; b=ZzlR1SUP8kHyys4ZysH3rv9yLxIJUCQElm5m06+Gco9kFHGJTfxWoYVAS+nkhA0oIJ wYkIn8hUvjusN2YEFjLDcQPJYmgV3IrVo8RqG906+sJqL+6B3dCDqS/mMIX6GoWWctRP ArzN8UFusirNQEkqewl3jtfc7l8r1b2f5EFeOd8XfiSUWHqUkOqlFBF4Ws3TJxP90Bzp amzZjV+bn9YHsqFwMpQhB+OFe/0wS2uFsGHtAf6b3cU3j7MtO2pyuj2ysEEHWVO3iG5A XOHzxO3ceSvGCxgJ0O/nyBE2racFEUCFQoA/spH9LHR5LHVZgI8otvmmQzt8R+5VMQHv rlIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pLZylrex; 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 u19si5298711edi.94.2021.04.05.03.10.29; Mon, 05 Apr 2021 03:10:52 -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=pLZylrex; 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 S232797AbhDEI4d (ORCPT + 99 others); Mon, 5 Apr 2021 04:56:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:34634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232806AbhDEI4O (ORCPT ); Mon, 5 Apr 2021 04:56:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BEFFC610E8; Mon, 5 Apr 2021 08:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617612969; bh=5k7aglYvnaGl3zaYUoWiQi1wuoJkCYsZfj+bfGd9Zf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pLZylrexLXol5XpHslzGiEbY5aRjD6Mm6iAYemyXiKnKDDMMj6tEWxK/ItX37sewo FKG7jpZbAlhRc364LMMROpqVogOwvakkfxkl12kBd4Z4f0NZJdR/EYCIvaXycfOYhb RCoBXoDJRBQUofb1J8FnouWyO3nrZbJm2vk7M6gA= 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 4.4 04/28] rpc: fix NULL dereference on kmalloc failure Date: Mon, 5 Apr 2021 10:53:38 +0200 Message-Id: <20210405085017.157226595@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085017.012074144@linuxfoundation.org> References: <20210405085017.012074144@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 91263d6a103b..bb8b0ef5de82 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1697,11 +1697,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. */ @@ -1742,10 +1745,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