[ovs-dev] [PATCH 1/2] socket-util: Unlink Unix domain sockets that bind but fail to connect.

Ethan Jackson ethan at nicira.com
Wed Mar 7 13:30:57 PST 2012


Looks good, thanks.

Ethan

On Mon, Feb 27, 2012 at 11:17, Ben Pfaff <blp at nicira.com> wrote:
> The error handling path here failed to clean up bound sockets, by removing
> them.  This fixes the problem.
>
> It was easy to observe this bug by running "ovs-vsctl" without
> "ovsdb-server" running.
>
> Bug #9769.
> Reported-by: Michael <mhu at nicira.com>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
>  lib/socket-util.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/socket-util.c b/lib/socket-util.c
> index 12f0432..37f8c9a 100644
> --- a/lib/socket-util.c
> +++ b/lib/socket-util.c
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
> + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
>  *
>  * Licensed under the Apache License, Version 2.0 (the "License");
>  * you may not use this file except in compliance with the License.
> @@ -458,7 +458,7 @@ error:
>         error = EPROTO;
>     }
>     if (bind_path) {
> -        fatal_signal_remove_file_to_unlink(bind_path);
> +        fatal_signal_unlink_file_now(bind_path);
>     }
>     close(fd);
>     return -error;
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev



More information about the dev mailing list