diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-11 07:06:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-11 07:35:56 +0000 |
| commit | 26c4e189e825d62d0249fb5f499bcb545d40e1ab (patch) | |
| tree | c136262c975d6f9d5d2e6f2e8decf9869b0b2c12 /main/linux-grsec/ipsec-xfrm-properly-handle-invalid-states-as-an-error.patch | |
| parent | 4fecabaa972fd0a12d76e54bbbdd5da7540290c6 (diff) | |
| download | aports-26c4e189e825d62d0249fb5f499bcb545d40e1ab.tar.bz2 aports-26c4e189e825d62d0249fb5f499bcb545d40e1ab.tar.xz | |
main/linux-grsec: upgrade to 3.9.5
Diffstat (limited to 'main/linux-grsec/ipsec-xfrm-properly-handle-invalid-states-as-an-error.patch')
| -rw-r--r-- | main/linux-grsec/ipsec-xfrm-properly-handle-invalid-states-as-an-error.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/main/linux-grsec/ipsec-xfrm-properly-handle-invalid-states-as-an-error.patch b/main/linux-grsec/ipsec-xfrm-properly-handle-invalid-states-as-an-error.patch deleted file mode 100644 index 7cb0dade7..000000000 --- a/main/linux-grsec/ipsec-xfrm-properly-handle-invalid-states-as-an-error.patch +++ /dev/null @@ -1,44 +0,0 @@ -From patchwork Wed May 22 11:40:47 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [ipsec] xfrm: properly handle invalid states as an error -Date: Wed, 22 May 2013 01:40:47 -0000 -From: =?utf-8?q?Timo_Ter=C3=A4s?= <timo.teras@iki.fi> -X-Patchwork-Id: 245594 -Message-Id: <1369222847-8542-1-git-send-email-timo.teras@iki.fi> -To: netdev@vger.kernel.org -Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>, - Li RongQing <roy.qing.li@gmail.com>, - Steffen Klassert <steffen.klassert@secunet.com> - -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> - ---- -Should go also to 3.9-stable. - - net/xfrm/xfrm_output.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c -index bcfda89..0cf003d 100644 ---- a/net/xfrm/xfrm_output.c -+++ b/net/xfrm/xfrm_output.c -@@ -64,6 +64,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) - - if (unlikely(x->km.state != XFRM_STATE_VALID)) { - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID); -+ err = -EINVAL; - goto error; - } - |