mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
235 lines
6.1 KiB
C
235 lines
6.1 KiB
C
/*
|
|
* linux/net/sunrpc/gss_generic_token.c
|
|
*
|
|
* Adapted from MIT Kerberos 5-1.2.1 lib/gssapi/generic/util_token.c
|
|
*
|
|
* Copyright (c) 2000 The Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* Andy Adamson <andros@umich.edu>
|
|
*/
|
|
|
|
/*
|
|
* Copyright 1993 by OpenVision Technologies, Inc.
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appears in all copies and
|
|
* that both that copyright notice and this permission notice appear in
|
|
* supporting documentation, and that the name of OpenVision not be used
|
|
* in advertising or publicity pertaining to distribution of the software
|
|
* without specific, written prior permission. OpenVision makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*
|
|
* OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
|
|
* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/module.h>
|
|
#include <linux/string.h>
|
|
#include <linux/sunrpc/sched.h>
|
|
#include <linux/sunrpc/gss_asn1.h>
|
|
|
|
|
|
#ifdef RPC_DEBUG
|
|
# define RPCDBG_FACILITY RPCDBG_AUTH
|
|
#endif
|
|
|
|
|
|
/* TWRITE_STR from gssapiP_generic.h */
|
|
#define TWRITE_STR(ptr, str, len) \
|
|
memcpy((ptr), (char *) (str), (len)); \
|
|
(ptr) += (len);
|
|
|
|
/* XXXX this code currently makes the assumption that a mech oid will
|
|
never be longer than 127 bytes. This assumption is not inherent in
|
|
the interfaces, so the code can be fixed if the OSI namespace
|
|
balloons unexpectedly. */
|
|
|
|
/* Each token looks like this:
|
|
|
|
0x60 tag for APPLICATION 0, SEQUENCE
|
|
(constructed, definite-length)
|
|
<length> possible multiple bytes, need to parse/generate
|
|
0x06 tag for OBJECT IDENTIFIER
|
|
<moid_length> compile-time constant string (assume 1 byte)
|
|
<moid_bytes> compile-time constant string
|
|
<inner_bytes> the ANY containing the application token
|
|
bytes 0,1 are the token type
|
|
bytes 2,n are the token data
|
|
|
|
For the purposes of this abstraction, the token "header" consists of
|
|
the sequence tag and length octets, the mech OID DER encoding, and the
|
|
first two inner bytes, which indicate the token type. The token
|
|
"body" consists of everything else.
|
|
|
|
*/
|
|
|
|
static int
|
|
der_length_size( int length)
|
|
{
|
|
if (length < (1<<7))
|
|
return(1);
|
|
else if (length < (1<<8))
|
|
return(2);
|
|
#if (SIZEOF_INT == 2)
|
|
else
|
|
return(3);
|
|
#else
|
|
else if (length < (1<<16))
|
|
return(3);
|
|
else if (length < (1<<24))
|
|
return(4);
|
|
else
|
|
return(5);
|
|
#endif
|
|
}
|
|
|
|
static void
|
|
der_write_length(unsigned char **buf, int length)
|
|
{
|
|
if (length < (1<<7)) {
|
|
*(*buf)++ = (unsigned char) length;
|
|
} else {
|
|
*(*buf)++ = (unsigned char) (der_length_size(length)+127);
|
|
#if (SIZEOF_INT > 2)
|
|
if (length >= (1<<24))
|
|
*(*buf)++ = (unsigned char) (length>>24);
|
|
if (length >= (1<<16))
|
|
*(*buf)++ = (unsigned char) ((length>>16)&0xff);
|
|
#endif
|
|
if (length >= (1<<8))
|
|
*(*buf)++ = (unsigned char) ((length>>8)&0xff);
|
|
*(*buf)++ = (unsigned char) (length&0xff);
|
|
}
|
|
}
|
|
|
|
/* returns decoded length, or < 0 on failure. Advances buf and
|
|
decrements bufsize */
|
|
|
|
static int
|
|
der_read_length(unsigned char **buf, int *bufsize)
|
|
{
|
|
unsigned char sf;
|
|
int ret;
|
|
|
|
if (*bufsize < 1)
|
|
return(-1);
|
|
sf = *(*buf)++;
|
|
(*bufsize)--;
|
|
if (sf & 0x80) {
|
|
if ((sf &= 0x7f) > ((*bufsize)-1))
|
|
return(-1);
|
|
if (sf > SIZEOF_INT)
|
|
return (-1);
|
|
ret = 0;
|
|
for (; sf; sf--) {
|
|
ret = (ret<<8) + (*(*buf)++);
|
|
(*bufsize)--;
|
|
}
|
|
} else {
|
|
ret = sf;
|
|
}
|
|
|
|
return(ret);
|
|
}
|
|
|
|
/* returns the length of a token, given the mech oid and the body size */
|
|
|
|
int
|
|
g_token_size(struct xdr_netobj *mech, unsigned int body_size)
|
|
{
|
|
/* set body_size to sequence contents size */
|
|
body_size += 2 + (int) mech->len; /* NEED overflow check */
|
|
return(1 + der_length_size(body_size) + body_size);
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(g_token_size);
|
|
|
|
/* fills in a buffer with the token header. The buffer is assumed to
|
|
be the right size. buf is advanced past the token header */
|
|
|
|
void
|
|
g_make_token_header(struct xdr_netobj *mech, int body_size, unsigned char **buf)
|
|
{
|
|
*(*buf)++ = 0x60;
|
|
der_write_length(buf, 2 + mech->len + body_size);
|
|
*(*buf)++ = 0x06;
|
|
*(*buf)++ = (unsigned char) mech->len;
|
|
TWRITE_STR(*buf, mech->data, ((int) mech->len));
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(g_make_token_header);
|
|
|
|
/*
|
|
* Given a buffer containing a token, reads and verifies the token,
|
|
* leaving buf advanced past the token header, and setting body_size
|
|
* to the number of remaining bytes. Returns 0 on success,
|
|
* G_BAD_TOK_HEADER for a variety of errors, and G_WRONG_MECH if the
|
|
* mechanism in the token does not match the mech argument. buf and
|
|
* *body_size are left unmodified on error.
|
|
*/
|
|
u32
|
|
g_verify_token_header(struct xdr_netobj *mech, int *body_size,
|
|
unsigned char **buf_in, int toksize)
|
|
{
|
|
unsigned char *buf = *buf_in;
|
|
int seqsize;
|
|
struct xdr_netobj toid;
|
|
int ret = 0;
|
|
|
|
if ((toksize-=1) < 0)
|
|
return(G_BAD_TOK_HEADER);
|
|
if (*buf++ != 0x60)
|
|
return(G_BAD_TOK_HEADER);
|
|
|
|
if ((seqsize = der_read_length(&buf, &toksize)) < 0)
|
|
return(G_BAD_TOK_HEADER);
|
|
|
|
if (seqsize != toksize)
|
|
return(G_BAD_TOK_HEADER);
|
|
|
|
if ((toksize-=1) < 0)
|
|
return(G_BAD_TOK_HEADER);
|
|
if (*buf++ != 0x06)
|
|
return(G_BAD_TOK_HEADER);
|
|
|
|
if ((toksize-=1) < 0)
|
|
return(G_BAD_TOK_HEADER);
|
|
toid.len = *buf++;
|
|
|
|
if ((toksize-=toid.len) < 0)
|
|
return(G_BAD_TOK_HEADER);
|
|
toid.data = buf;
|
|
buf+=toid.len;
|
|
|
|
if (! g_OID_equal(&toid, mech))
|
|
ret = G_WRONG_MECH;
|
|
|
|
/* G_WRONG_MECH is not returned immediately because it's more important
|
|
to return G_BAD_TOK_HEADER if the token header is in fact bad */
|
|
|
|
if ((toksize-=2) < 0)
|
|
return(G_BAD_TOK_HEADER);
|
|
|
|
if (ret)
|
|
return(ret);
|
|
|
|
if (!ret) {
|
|
*buf_in = buf;
|
|
*body_size = toksize;
|
|
}
|
|
|
|
return(ret);
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(g_verify_token_header);
|
|
|