nfsd4: don't try to map gid's in generic rpc code (dc83d6e2) · Commits · 戴 / test

net/sunrpc/svcauth_unix.c

+30 −23

Original line number	Diff line number	Diff line
		@@ -655,23 +655,25 @@ static struct unix_gid *unix_gid_lookup(uid_t uid)
		return NULL;
		}

		static int unix_gid_find(uid_t uid, struct group_info **gip,
		struct svc_rqst *rqstp)
		static struct group_info unix_gid_find(uid_t uid, struct svc_rqst rqstp)
		{
		struct unix_gid *ug = unix_gid_lookup(uid);
		struct unix_gid *ug;
		struct group_info *gi;
		int ret;

		ug = unix_gid_lookup(uid);
		if (!ug)
		return -EAGAIN;
		switch (cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle)) {
		return ERR_PTR(-EAGAIN);
		ret = cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle);
		switch (ret) {
		case -ENOENT:
		*gip = NULL;
		return 0;
		return ERR_PTR(-ENOENT);
		case 0:
		*gip = ug->gi;
		get_group_info(*gip);
		gi = get_group_info(ug->gi);
		cache_put(&ug->h, &unix_gid_cache);
		return 0;
		return gi;
		default:
		return -EAGAIN;
		return ERR_PTR(-EAGAIN);
		}
		}

		@@ -681,6 +683,8 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
		struct sockaddr_in *sin;
		struct sockaddr_in6 *sin6, sin6_storage;
		struct ip_map *ipm;
		struct group_info *gi;
		struct svc_cred *cred = &rqstp->rq_cred;

		switch (rqstp->rq_addr.ss_family) {
		case AF_INET:
		@@ -722,6 +726,17 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
		ip_map_cached_put(rqstp, ipm);
		break;
		}

		gi = unix_gid_find(cred->cr_uid, rqstp);
		switch (PTR_ERR(gi)) {
		case -EAGAIN:
		return SVC_DROP;
		case -ENOENT:
		break;
		default:
		put_group_info(cred->cr_group_info);
		cred->cr_group_info = gi;
		}
		return SVC_OK;
		}

		@@ -818,19 +833,11 @@ svcauth_unix_accept(struct svc_rqst rqstp, __be32 authp)
		slen = svc_getnl(argv); /* gids length */
		if (slen > 16 \|\| (len -= (slen + 2)*4) < 0)
		goto badcred;
		if (unix_gid_find(cred->cr_uid, &cred->cr_group_info, rqstp)
		== -EAGAIN)
		return SVC_DROP;
		if (cred->cr_group_info == NULL) {
		cred->cr_group_info = groups_alloc(slen);
		if (cred->cr_group_info == NULL)
		return SVC_DROP;
		for (i = 0; i < slen; i++)
		GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
		} else {
		for (i = 0; i < slen ; i++)
		svc_getnl(argv);
		}
		if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) \|\| svc_getu32(argv) != 0) {
		*authp = rpc_autherr_badverf;
		return SVC_DENIED;

Admin message