This is a note to let you know that I've just added the patch titled
xfrm: properly handle invalid states as an error
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xfrm-properly-handle-invalid-states-as-an-error.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From dabfc479b73e468e06a8aa74432b0ac34b3ca7e1 Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@xxxxxx>
Date: Wed, 22 May 2013 01:40:47 +0000
Subject: xfrm: properly handle invalid states as an error
From: Timo Teräs <timo.teras@xxxxxx>
[ Upstream commit 497574c72c9922cf20c12aed15313c389f722fa0 ]
The error exit path needs err explicitly set. Otherwise it
returns success and the only caller, xfrm_output_resume(),
would oops in skb_dst(skb)->ops derefence as skb_dst(skb) is
NULL.
Bug introduced in commit bb65a9cb (xfrm: removes a superfluous
check and add a statistic).
Signed-off-by: Timo Teräs <timo.teras@xxxxxx>
Cc: Li RongQing <roy.qing.li@xxxxxxxxx>
Cc: Steffen Klassert <steffen.klassert@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/xfrm/xfrm_output.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -64,6 +64,7 @@ static int xfrm_output_one(struct sk_buf
if (unlikely(x->km.state != XFRM_STATE_VALID)) {
XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID);
+ err = -EINVAL;
goto error;
}
Patches currently in stable-queue which might be from timo.teras@xxxxxx are
queue-3.9/xfrm-properly-handle-invalid-states-as-an-error.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html