Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5c6efba authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Greg Kroah-Hartman
Browse files

SUNRPC: Move simple_get_bytes and simple_get_netobj into private header 



[ Upstream commit ba6dfce47c4d002d96cd02a304132fca76981172 ]

Remove duplicated helper functions to parse opaque XDR objects
and place inside new file net/sunrpc/auth_gss/auth_gss_internal.h.
In the new file carry the license and copyright from the source file
net/sunrpc/auth_gss/auth_gss.c.  Finally, update the comment inside
include/linux/sunrpc/xdr.h since lockd is not the only user of
struct xdr_netobj.

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 45115259

include/linux/sunrpc/xdr.h

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ struct rpc_rqst; 
#define XDR_QUADLEN(l)		(((l) + 3) >> 2)



/*

 * Generic opaque `network object.' At the kernel level, this type

 * is used only by lockd.

 * Generic opaque `network object.'

 */

#define XDR_MAX_NETOBJ		1024

struct xdr_netobj {

net/sunrpc/auth_gss/auth_gss.c

+1 −29
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/uaccess.h>

#include <linux/hashtable.h>



#include "auth_gss_internal.h"

#include "../netns.h"



static const struct rpc_authops authgss_ops;
@@ -147,35 +148,6 @@ gss_cred_set_ctx(struct rpc_cred *cred, struct gss_cl_ctx *ctx) 
	clear_bit(RPCAUTH_CRED_NEW, &cred->cr_flags);

}



static const void *

simple_get_bytes(const void *p, const void *end, void *res, size_t len)

{

	const void *q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	memcpy(res, p, len);

	return q;

}



static inline const void *

simple_get_netobj(const void *p, const void *end, struct xdr_netobj *dest)

{

	const void *q;

	unsigned int len;



	p = simple_get_bytes(p, end, &len, sizeof(len));

	if (IS_ERR(p))

		return p;

	q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	dest->data = kmemdup(p, len, GFP_NOFS);

	if (unlikely(dest->data == NULL))

		return ERR_PTR(-ENOMEM);

	dest->len = len;

	return q;

}



static struct gss_cl_ctx *

gss_cred_get_ctx(struct rpc_cred *cred)

{

net/sunrpc/auth_gss/auth_gss_internal.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * linux/net/sunrpc/auth_gss/auth_gss_internal.h

 *

 * Internal definitions for RPCSEC_GSS client authentication

 *

 * Copyright (c) 2000 The Regents of the University of Michigan.

 * All rights reserved.

 *

 */

#include <linux/err.h>

#include <linux/string.h>

#include <linux/sunrpc/xdr.h>



static inline const void *

simple_get_bytes(const void *p, const void *end, void *res, size_t len)

{

	const void *q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	memcpy(res, p, len);

	return q;

}



static inline const void *

simple_get_netobj(const void *p, const void *end, struct xdr_netobj *dest)

{

	const void *q;

	unsigned int len;



	p = simple_get_bytes(p, end, &len, sizeof(len));

	if (IS_ERR(p))

		return p;

	q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	dest->data = kmemdup(p, len, GFP_NOFS);

	if (unlikely(dest->data == NULL))

		return ERR_PTR(-ENOMEM);

	dest->len = len;

	return q;

}

net/sunrpc/auth_gss/gss_krb5_mech.c

+2 −29
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#include <linux/sunrpc/xdr.h>

#include <linux/sunrpc/gss_krb5_enctypes.h>



#include "auth_gss_internal.h"



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

# define RPCDBG_FACILITY	RPCDBG_AUTH

#endif
@@ -187,35 +189,6 @@ get_gss_krb5_enctype(int etype) 
	return NULL;

}



static const void *

simple_get_bytes(const void *p, const void *end, void *res, int len)

{

	const void *q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	memcpy(res, p, len);

	return q;

}



static const void *

simple_get_netobj(const void *p, const void *end, struct xdr_netobj *res)

{

	const void *q;

	unsigned int len;



	p = simple_get_bytes(p, end, &len, sizeof(len));

	if (IS_ERR(p))

		return p;

	q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	res->data = kmemdup(p, len, GFP_NOFS);

	if (unlikely(res->data == NULL))

		return ERR_PTR(-ENOMEM);

	res->len = len;

	return q;

}



static inline const void *

get_key(const void *p, const void *end,

	struct krb5_ctx *ctx, struct crypto_skcipher **res)