diff --git a/[refs] b/[refs] index d7ae4688ec7c..433bf64b5e09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97ef1bb0c8e371b7988287f38bd107c4aa14d78d +refs/heads/master: 298bb62175a8e8c2f21f3e00543cda853f423599 diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c index 7969f8a716df..266f112c38c2 100644 --- a/trunk/net/key/af_key.c +++ b/trunk/net/key/af_key.c @@ -395,9 +395,9 @@ static inline int pfkey_sec_ctx_len(struct sadb_x_sec_ctx *sec_ctx) static inline int verify_sec_ctx_len(void *p) { struct sadb_x_sec_ctx *sec_ctx = (struct sadb_x_sec_ctx *)p; - int len; + int len = sec_ctx->sadb_x_ctx_len; - if (sec_ctx->sadb_x_ctx_len > PAGE_SIZE) + if (len > PAGE_SIZE) return -EINVAL; len = pfkey_sec_ctx_len(sec_ctx);