On Wed, Apr 03, 2013 at 09:02:28PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
> ---
> net/sctp/socket.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index dd21ae3..f631c5f 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -1119,9 +1119,10 @@ static int __sctp_connect(struct sock* sk,
> /* Make sure the destination port is correctly set
> * in all addresses.
> */
> - if (asoc && asoc->peer.port && asoc->peer.port != port)
> + if (asoc && asoc->peer.port && asoc->peer.port != port) {
> + err = -EINVAL;
> goto out_free;
> -
> + }
>
> /* Check if there already is a matching association on the
> * endpoint (other than the one created here).
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Actually, I think you can remove that entire if statement (as well as some
checks further down). Looking at the net-next trees __sctp_connect, it appears
that asoc is set to NULL at the top of the function, and not assigned to
anything else until the call to sctp_association_new much farther down (line
1201). That means the above if statement, as well as this:
if (asoc2 && asoc2 != asoc) {
and this:
if (!asoc) {
will always be false, false, and true, respectively.
Regards
Neil
--
To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
