| From dabfc479b73e468e06a8aa74432b0ac34b3ca7e1 Mon Sep 17 00:00:00 2001 |
| From: Timo Teräs <timo.teras@iki.fi> |
| Date: Wed, 22 May 2013 01:40:47 +0000 |
| Subject: xfrm: properly handle invalid states as an error |
| |
| From: Timo Teräs <timo.teras@iki.fi> |
| |
| [ 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@iki.fi> |
| Cc: Li RongQing <roy.qing.li@gmail.com> |
| Cc: Steffen Klassert <steffen.klassert@secunet.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| 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; |
| } |
| |
