Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3325538pxf; Mon, 5 Apr 2021 09:05:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwe5usScprViI/I/HLstUVbkv3xZbzseecJ2kAMiCJ3B786+avGzNWqMxOeDqV3LY3X40uy X-Received: by 2002:adf:f94c:: with SMTP id q12mr29607164wrr.283.1617638712636; Mon, 05 Apr 2021 09:05:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617638712; cv=none; d=google.com; s=arc-20160816; b=tHAtGuiRZmRcwS0IiDY5HYZmbzmeTwTaSQVjAkeB8RzNGR4InE+PH+80DEGGk8OMth TLIBbBY04W2Ub71R31IQ8d569F9MKiiJ1SBte0K10kr8lKjDaYIJvz6CNsovaPBJaZX+ Beu/6Hger14zfBFK3/mKR5DpWOuMuc4xoJduFLtENcYAjA+vU6wMU+khxYHGxgkn0g5u HDNt+xftMSBXRzrncqtKvv2ySKxSxXHVlT37nlSGvgJYXdJUSmKLMs0ZGMNS7dW1yy1G iR4cQZSQ/+8ZC0F12yJYFusKPcClCeXtFf2ks1xQaXNyTuvgrms2kGeuAInLeebKXRBA WmXg== 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=6EBRWkPMvH2Hq4A6TY3xcRyZsX+PDca4IdTWOLDVi8c=; b=KqAwhE1TbqTisnvitM4ML1jGg+zzzHPpcScqWCypLsa9Oy594HHDpOkXDHtb5kp/KD d0K5cdlikCGVKHTctN8IQy3Aok06QDWgK6U4xpnotcZn+VlyDeI0S9rryeplDmbcFamd JKpWTHW86xdBEvaubfU+P0Cg5DjvG+/Over2QVapGyiBq/IzfoUGaROkrM0dvCyrgtNY QZ+Pb84tPVnKQEnS6INJVVz6mG7jFpH8jj9B4oHMQfdRIii3LMZJ3IPEwk0TXKwGare2 o6/b4tSXPSi3EbHdfr7tM6JNjWeK2lc3D/+EAq0o6h24mQxhVnhPTMO2v66jZuCa6hER +rdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mkkzuZhr; 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 qo24si13541770ejb.99.2021.04.05.09.04.47; Mon, 05 Apr 2021 09:05:12 -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=mkkzuZhr; 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 S239181AbhDEJJf (ORCPT + 99 others); Mon, 5 Apr 2021 05:09:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:52604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238374AbhDEJHZ (ORCPT ); Mon, 5 Apr 2021 05:07:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 570B261393; Mon, 5 Apr 2021 09:07:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613639; bh=sI1nqhAPYcz2DuwhpaJVTqAYzJeVkMWrIZ9wJrE/3MI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mkkzuZhrNfHTh2jm0MFjG4U4hpbSmeU97zckhGWGWijtS8iY32gPsP75RhM94uExu 5k+ZDC57asP02cDDFcKfA6lPnVSg0zXDjTjt/lxvH8aGaF8Wj1+vPOGQ/uTET9zP4V i+QMwLXvOua4xjqW9lbH88usduXqjVbYfalzEtKo= 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.10 007/126] rpc: fix NULL dereference on kmalloc failure Date: Mon, 5 Apr 2021 10:52:49 +0200 Message-Id: <20210405085031.280032394@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085031.040238881@linuxfoundation.org> References: <20210405085031.040238881@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 bd4678db9d76..6dff64374bfe 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1825,11 +1825,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. */ @@ -1870,10 +1873,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