[PATCH] fix typo in 2.4 ipsec backport

[PATCH] fix typo in 2.4 ipsec backport

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 132 bytes --]

This patch fixes a 0x10-ptr dereference in __xfrm4_find_acq ;)

0x231 <__xfrm4_find_acq+241>:   incl   0x10

Best regards,
Patrick


[-- Attachment #2: xfrm4_state-typo.diff --]
[-- Type: text/plain, Size: 967 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1210  -> 1.1211 
#	net/ipv4/xfrm4_state.c	1.3     -> 1.4    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/13	kaber@trash.net	1.1211
# [IPSEC] fix typo
# --------------------------------------------
#
diff -Nru a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
--- a/net/ipv4/xfrm4_state.c	Tue May 13 04:22:50 2003
+++ b/net/ipv4/xfrm4_state.c	Tue May 13 04:22:50 2003
@@ -101,7 +101,7 @@
 		x0->lft.hard_add_expires_seconds = XFRM_ACQ_EXPIRES;
 		xfrm_state_hold(x0);
 		mod_timer(&x0->timer, jiffies + XFRM_ACQ_EXPIRES*HZ);
-		xfrm_state_hold(0);
+		xfrm_state_hold(x0);
 		list_add_tail(&x0->bydst, xfrm4_state_afinfo.state_bydst+h);
 		wake_up(&km_waitq);
 	}

Re: [PATCH] fix typo in 2.4 ipsec backport

[David S. Miller]

   From: Patrick McHardy <kaber@trash.net>
   Date: Tue, 13 May 2003 04:28:09 +0200

   This patch fixes a 0x10-ptr dereference in __xfrm4_find_acq ;)
   
The same bug is in 2.5.x too.  It's fallout from James Morris's
atomic_inc() --> xfrm_state_get() cleanup.

Applied, thanks a lot.

Re: [PATCH] fix typo in 2.4 ipsec backport

[Valdis.Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

On Tue, 13 May 2003 04:28:09 +0200, Patrick McHardy said:

> --- a/net/ipv4/xfrm4_state.c	Tue May 13 04:22:50 2003
> +++ b/net/ipv4/xfrm4_state.c	Tue May 13 04:22:50 2003
> @@ -101,7 +101,7 @@
>  		x0->lft.hard_add_expires_seconds = XFRM_ACQ_EXPIRES;
>  		xfrm_state_hold(x0);
>  		mod_timer(&x0->timer, jiffies + XFRM_ACQ_EXPIRES*HZ);
> -		xfrm_state_hold(0);
> +		xfrm_state_hold(x0);

What a blecherous variable name. Somebody is going to try 'fixing' it
to 0x0 one of these days.. ;)

[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]