netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] sctp: fix error path in sctp_proc_init
@ 2008-06-17 12:29 Pavel Emelyanov
  2008-06-17 12:29 ` Pavel Emelyanov
  2008-06-17 13:46 ` Vlad Yasevich
  0 siblings, 2 replies; 4+ messages in thread
From: Pavel Emelyanov @ 2008-06-17 12:29 UTC (permalink / raw)
  To: Vlad Yasevich, David Miller; +Cc: linux-sctp, Linux Netdev List

After the sctp_remaddr_proc_init failed, the proper rollback is
not the sctp_remaddr_proc_exit, but the sctp_assocs_proc_exit.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 23aaffb..98c6a88 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -119,7 +119,7 @@ static __init int sctp_proc_init(void)
 	return 0;
 
 out_remaddr_proc_init:
-	sctp_remaddr_proc_exit();
+	sctp_assocs_proc_exit();
 out_assocs_proc_init:
 	sctp_eps_proc_exit();
 out_eps_proc_init:

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] sctp: fix error path in sctp_proc_init
  2008-06-17 12:29 [PATCH] sctp: fix error path in sctp_proc_init Pavel Emelyanov
@ 2008-06-17 12:29 ` Pavel Emelyanov
  2008-06-17 13:46 ` Vlad Yasevich
  1 sibling, 0 replies; 4+ messages in thread
From: Pavel Emelyanov @ 2008-06-17 12:29 UTC (permalink / raw)
  To: Vlad Yasevich, David Miller; +Cc: linux-sctp, Linux Netdev List

Pavel Emelyanov wrote:
> After the sctp_remaddr_proc_init failed, the proper rollback is
> not the sctp_remaddr_proc_exit, but the sctp_assocs_proc_exit.
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

Oops, sorry - this is for net-next-2.6.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] sctp: fix error path in sctp_proc_init
  2008-06-17 12:29 [PATCH] sctp: fix error path in sctp_proc_init Pavel Emelyanov
  2008-06-17 12:29 ` Pavel Emelyanov
@ 2008-06-17 13:46 ` Vlad Yasevich
  2008-06-17 21:41   ` David Miller
  1 sibling, 1 reply; 4+ messages in thread
From: Vlad Yasevich @ 2008-06-17 13:46 UTC (permalink / raw)
  To: Pavel Emelyanov; +Cc: David Miller, linux-sctp, Linux Netdev List

Pavel Emelyanov wrote:
> After the sctp_remaddr_proc_init failed, the proper rollback is
> not the sctp_remaddr_proc_exit, but the sctp_assocs_proc_exit.
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

Ack for net-next-2.6.

Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>

-vlad

> 
> ---
> 
> diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
> index 23aaffb..98c6a88 100644
> --- a/net/sctp/protocol.c
> +++ b/net/sctp/protocol.c
> @@ -119,7 +119,7 @@ static __init int sctp_proc_init(void)
>  	return 0;
>  
>  out_remaddr_proc_init:
> -	sctp_remaddr_proc_exit();
> +	sctp_assocs_proc_exit();
>  out_assocs_proc_init:
>  	sctp_eps_proc_exit();
>  out_eps_proc_init:
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] sctp: fix error path in sctp_proc_init
  2008-06-17 13:46 ` Vlad Yasevich
@ 2008-06-17 21:41   ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2008-06-17 21:41 UTC (permalink / raw)
  To: vladislav.yasevich; +Cc: xemul, linux-sctp, netdev

From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Tue, 17 Jun 2008 09:46:13 -0400

> Pavel Emelyanov wrote:
> > After the sctp_remaddr_proc_init failed, the proper rollback is
> > not the sctp_remaddr_proc_exit, but the sctp_assocs_proc_exit.
> > 
> > Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
> 
> Ack for net-next-2.6.
> 
> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>

I added this bug during the net-2.6 --> net-next-2.6 merge, sorry :-)

I'll apply this, thanks everyone!

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-06-17 21:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-17 12:29 [PATCH] sctp: fix error path in sctp_proc_init Pavel Emelyanov
2008-06-17 12:29 ` Pavel Emelyanov
2008-06-17 13:46 ` Vlad Yasevich
2008-06-17 21:41   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).