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

Commit 71085745 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'rxrpc-rewrite-20170721' of... 

Merge tag 'rxrpc-rewrite-20170721' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs



David Howells says:

====================
rxrpc: Rearrange headers

Here's a pair of patches that rearrange some of the AF_RXRPC header files
that are outside of the net/rxrpc/ directory:

 (1) The bits userspace need are moved to uapi/linux/rxrpc.h.  [Should this
     be af_rxrpc.h instead, I wonder - but there doesn't seem to be
     precedent for that in the other net UAPI headers.]

 (2) For the most part, the contents of rxrpc/packet.h are no longer used
     outside of the AF_RXRPC module, so move them to net/rxrpc/protocol.h
     with the exception of the standard abort codes which are exposed to
     userspace when an abort occurs and the security index values which are
     needed when constructing keys.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4a3c67a6 ddc6c70f

fs/afs/misc.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <rxrpc/packet.h>

#include "internal.h"

#include "internal.h"

#include "afs_fs.h"

#include "afs_fs.h"

fs/afs/rxrpc.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 




#include <net/sock.h>

#include <net/sock.h>

#include <net/af_rxrpc.h>

#include <net/af_rxrpc.h>

#include <rxrpc/packet.h>

#include "internal.h"

#include "internal.h"

#include "afs_cm.h"

#include "afs_cm.h"

include/linux/rxrpc.h→include/uapi/linux/rxrpc.h

+51 −6
Original line number Original line Diff line number Diff line 
/* AF_RXRPC parameters

/* Types and definitions for AF_RXRPC.

 *

 *

 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.

 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 * Written by David Howells (dhowells@redhat.com)

 *

 *

 * This program is free software; you can redistribute it and/or

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 * 2 of the Licence, or (at your option) any later version.

 */

 */





#ifndef _LINUX_RXRPC_H

#ifndef _UAPI_LINUX_RXRPC_H

#define _LINUX_RXRPC_H

#define _UAPI_LINUX_RXRPC_H





#include <linux/types.h>

#include <linux/in.h>

#include <linux/in.h>

#include <linux/in6.h>

#include <linux/in6.h>
@@ -76,4 +77,48 @@ enum rxrpc_cmsg_type { 
#define RXRPC_SECURITY_RXGK	4	/* gssapi-based */

#define RXRPC_SECURITY_RXGK	4	/* gssapi-based */

#define RXRPC_SECURITY_RXK5	5	/* kerberos 5 */

#define RXRPC_SECURITY_RXK5	5	/* kerberos 5 */





#endif /* _LINUX_RXRPC_H */
 
/*

 * RxRPC-level abort codes

 */

#define RX_CALL_DEAD		-1	/* call/conn has been inactive and is shut down */

#define RX_INVALID_OPERATION	-2	/* invalid operation requested / attempted */

#define RX_CALL_TIMEOUT		-3	/* call timeout exceeded */

#define RX_EOF			-4	/* unexpected end of data on read op */

#define RX_PROTOCOL_ERROR	-5	/* low-level protocol error */

#define RX_USER_ABORT		-6	/* generic user abort */

#define RX_ADDRINUSE		-7	/* UDP port in use */

#define RX_DEBUGI_BADTYPE	-8	/* bad debugging packet type */



/*

 * (un)marshalling abort codes (rxgen)

 */

#define RXGEN_CC_MARSHAL	-450

#define RXGEN_CC_UNMARSHAL	-451

#define RXGEN_SS_MARSHAL	-452

#define RXGEN_SS_UNMARSHAL	-453

#define RXGEN_DECODE		-454

#define RXGEN_OPCODE		-455

#define RXGEN_SS_XDRFREE	-456

#define RXGEN_CC_XDRFREE	-457



/*

 * Rx kerberos security abort codes

 * - unfortunately we have no generalised security abort codes to say things

 *   like "unsupported security", so we have to use these instead and hope the

 *   other side understands

 */

#define RXKADINCONSISTENCY	19270400	/* security module structure inconsistent */

#define RXKADPACKETSHORT	19270401	/* packet too short for security challenge */

#define RXKADLEVELFAIL		19270402	/* security level negotiation failed */

#define RXKADTICKETLEN		19270403	/* ticket length too short or too long */

#define RXKADOUTOFSEQUENCE	19270404	/* packet had bad sequence number */

#define RXKADNOAUTH		19270405	/* caller not authorised */

#define RXKADBADKEY		19270406	/* illegal key: bad parity or weak */

#define RXKADBADTICKET		19270407	/* security object was passed a bad ticket */

#define RXKADUNKNOWNKEY		19270408	/* ticket contained unknown key version number */

#define RXKADEXPIRED		19270409	/* authentication expired */

#define RXKADSEALEDINCON	19270410	/* sealed data inconsistent */

#define RXKADDATALEN		19270411	/* user data too long */

#define RXKADILLEGALLEVEL	19270412	/* caller not authorised to use encrypted conns */



#endif /* _UAPI_LINUX_RXRPC_H */

net/rxrpc/ar-internal.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <net/netns/generic.h>

#include <net/netns/generic.h>

#include <net/sock.h>

#include <net/sock.h>

#include <net/af_rxrpc.h>

#include <net/af_rxrpc.h>

#include <rxrpc/packet.h>

#include "protocol.h"





#if 0

#if 0

#define CHECK_SLAB_OKAY(X)				     \

#define CHECK_SLAB_OKAY(X)				     \

include/rxrpc/packet.h→net/rxrpc/protocol.h

+0 −45
Original line number Original line Diff line number Diff line
@@ -187,49 +187,4 @@ struct rxkad_response { 
	__be32		ticket_len;	/* Kerberos ticket length  */

	__be32		ticket_len;	/* Kerberos ticket length  */

} __packed;

} __packed;





/*****************************************************************************/

/*

 * RxRPC-level abort codes

 */

#define RX_CALL_DEAD		-1	/* call/conn has been inactive and is shut down */

#define RX_INVALID_OPERATION	-2	/* invalid operation requested / attempted */

#define RX_CALL_TIMEOUT		-3	/* call timeout exceeded */

#define RX_EOF			-4	/* unexpected end of data on read op */

#define RX_PROTOCOL_ERROR	-5	/* low-level protocol error */

#define RX_USER_ABORT		-6	/* generic user abort */

#define RX_ADDRINUSE		-7	/* UDP port in use */

#define RX_DEBUGI_BADTYPE	-8	/* bad debugging packet type */



/*

 * (un)marshalling abort codes (rxgen)

 */

#define	RXGEN_CC_MARSHAL    -450

#define	RXGEN_CC_UNMARSHAL  -451

#define	RXGEN_SS_MARSHAL    -452

#define	RXGEN_SS_UNMARSHAL  -453

#define	RXGEN_DECODE	    -454

#define	RXGEN_OPCODE	    -455

#define	RXGEN_SS_XDRFREE    -456

#define	RXGEN_CC_XDRFREE    -457



/*

 * Rx kerberos security abort codes

 * - unfortunately we have no generalised security abort codes to say things

 *   like "unsupported security", so we have to use these instead and hope the

 *   other side understands

 */

#define RXKADINCONSISTENCY	19270400	/* security module structure inconsistent */

#define RXKADPACKETSHORT	19270401	/* packet too short for security challenge */

#define RXKADLEVELFAIL		19270402	/* security level negotiation failed */

#define RXKADTICKETLEN		19270403	/* ticket length too short or too long */

#define RXKADOUTOFSEQUENCE	19270404	/* packet had bad sequence number */

#define RXKADNOAUTH		19270405	/* caller not authorised */

#define RXKADBADKEY		19270406	/* illegal key: bad parity or weak */

#define RXKADBADTICKET		19270407	/* security object was passed a bad ticket */

#define RXKADUNKNOWNKEY		19270408	/* ticket contained unknown key version number */

#define RXKADEXPIRED		19270409	/* authentication expired */

#define RXKADSEALEDINCON	19270410	/* sealed data inconsistent */

#define RXKADDATALEN		19270411	/* user data too long */

#define RXKADILLEGALLEVEL	19270412	/* caller not authorised to use encrypted conns */



#endif /* _LINUX_RXRPC_PACKET_H */
 
#endif /* _LINUX_RXRPC_PACKET_H */