From 617fc8b322be1f07040e59a153742ed69e49c96b Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Mon, 1 Feb 2010 02:12:19 +0000 Subject: [PATCH] --- yaml --- r: 180391 b: refs/heads/master c: 8ed030dd0aa400d18c63861c2c6deb7c38f4edde h: refs/heads/master i: 180389: 04916c6809059bc4afe140d63f9b870399a5d6d1 180387: 5ea3b78987419b2833923e539500bfaab890f2b9 180383: 748641e9b97b4d9416dc887edbe75c606f4f0c02 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccid.c | 2 +- trunk/net/dccp/ccid.h | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 446dd7395722..fafa39120b25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6815077e75c5b7f55b56fc3788e328514d4e72a +refs/heads/master: 8ed030dd0aa400d18c63861c2c6deb7c38f4edde diff --git a/trunk/net/dccp/ccid.c b/trunk/net/dccp/ccid.c index 57dfb9c8c4f2..ff16e9df1969 100644 --- a/trunk/net/dccp/ccid.c +++ b/trunk/net/dccp/ccid.c @@ -83,7 +83,7 @@ static struct kmem_cache *ccid_kmem_cache_create(int obj_size, char *slab_name_f va_list args; va_start(args, fmt); - vsnprintf(slab_name_fmt, sizeof(slab_name_fmt), fmt, args); + vsnprintf(slab_name_fmt, CCID_SLAB_NAME_LENGTH, fmt, args); va_end(args); slab = kmem_cache_create(slab_name_fmt, sizeof(struct ccid) + obj_size, 0, diff --git a/trunk/net/dccp/ccid.h b/trunk/net/dccp/ccid.h index 269958bf7fe9..6df6f8ac9636 100644 --- a/trunk/net/dccp/ccid.h +++ b/trunk/net/dccp/ccid.h @@ -19,7 +19,9 @@ #include #include -#define CCID_MAX 255 +/* maximum value for a CCID (RFC 4340, 19.5) */ +#define CCID_MAX 255 +#define CCID_SLAB_NAME_LENGTH 32 struct tcp_info; @@ -49,8 +51,8 @@ struct ccid_operations { const char *ccid_name; struct kmem_cache *ccid_hc_rx_slab, *ccid_hc_tx_slab; - char ccid_hc_rx_slab_name[32]; - char ccid_hc_tx_slab_name[32]; + char ccid_hc_rx_slab_name[CCID_SLAB_NAME_LENGTH]; + char ccid_hc_tx_slab_name[CCID_SLAB_NAME_LENGTH]; __u32 ccid_hc_rx_obj_size, ccid_hc_tx_obj_size; /* Interface Routines */