Skip to content

Commit 0ddc942

Browse files
J. Bruce Fieldschucklever
authored andcommitted
rpc: fix NULL dereference on kmalloc failure
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 <bfields@redhat.com> Link: https://lore.kernel.org/linux-nfs/3F1B347F-B809-478F-A1E9-0BE98E22B0F0@oracle.com/T/#t Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent f1442d6 commit 0ddc942

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

net/sunrpc/auth_gss/svcauth_gss.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,11 +1825,14 @@ static int
18251825
svcauth_gss_release(struct svc_rqst *rqstp)
18261826
{
18271827
struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;
1828-
struct rpc_gss_wire_cred *gc = &gsd->clcred;
1828+
struct rpc_gss_wire_cred *gc;
18291829
struct xdr_buf *resbuf = &rqstp->rq_res;
18301830
int stat = -EINVAL;
18311831
struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);
18321832

1833+
if (!gsd)
1834+
goto out;
1835+
gc = &gsd->clcred;
18331836
if (gc->gc_proc != RPC_GSS_PROC_DATA)
18341837
goto out;
18351838
/* Release can be called twice, but we only wrap once. */
@@ -1870,10 +1873,10 @@ svcauth_gss_release(struct svc_rqst *rqstp)
18701873
if (rqstp->rq_cred.cr_group_info)
18711874
put_group_info(rqstp->rq_cred.cr_group_info);
18721875
rqstp->rq_cred.cr_group_info = NULL;
1873-
if (gsd->rsci)
1876+
if (gsd && gsd->rsci) {
18741877
cache_put(&gsd->rsci->h, sn->rsc_cache);
1875-
gsd->rsci = NULL;
1876-
1878+
gsd->rsci = NULL;
1879+
}
18771880
return stat;
18781881
}
18791882

0 commit comments

Comments
 (0)