From 348509f4d7db724e9e4a2f732f737dbdf2a14269 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 21 Nov 2012 01:37:38 +0000 Subject: [PATCH] --- yaml --- r: 335919 b: refs/heads/master c: e93b5f9f320db431ec8623a4c667811007e07fd7 h: refs/heads/master i: 335917: ddd38400cb506a9b27f6fb081f8ff7ce0aa0be05 335915: a016388e210f2aa8461af3de114a030cd9b75a76 335911: 7d061830e896ecdf9e01a4f6058111b3e71c27bd 335903: c92eadb753d8b0acb50f43216d26d2d025b8c9ec v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink_cttimeout.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d03637eb5dcf..9ac2d34e8b67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fe198e6b136c516df493ec325ab8f70d470f477 +refs/heads/master: e93b5f9f320db431ec8623a4c667811007e07fd7 diff --git a/trunk/net/netfilter/nfnetlink_cttimeout.c b/trunk/net/netfilter/nfnetlink_cttimeout.c index 8847b4d8be06..701c88a20fea 100644 --- a/trunk/net/netfilter/nfnetlink_cttimeout.c +++ b/trunk/net/netfilter/nfnetlink_cttimeout.c @@ -41,7 +41,8 @@ MODULE_DESCRIPTION("cttimeout: Extended Netfilter Connection Tracking timeout tu static LIST_HEAD(cttimeout_list); static const struct nla_policy cttimeout_nla_policy[CTA_TIMEOUT_MAX+1] = { - [CTA_TIMEOUT_NAME] = { .type = NLA_NUL_STRING }, + [CTA_TIMEOUT_NAME] = { .type = NLA_NUL_STRING, + .len = CTNL_TIMEOUT_NAME_MAX - 1}, [CTA_TIMEOUT_L3PROTO] = { .type = NLA_U16 }, [CTA_TIMEOUT_L4PROTO] = { .type = NLA_U8 }, [CTA_TIMEOUT_DATA] = { .type = NLA_NESTED },