| Message ID | 52A82566.1050601@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Dec 11, 2013 at 04:42:14PM +0800, Wang Weidong wrote: > In sctp_err_lookup, goto out while the asoc is not NULL, so remove the > check NULL. Also, in sctp_err_finish which called by sctp_v4_err and > sctp_v6_err, they pass asoc to sctp_err_finish while the asoc is not > NULL, so remove the check. > > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> > --- > net/sctp/input.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/net/sctp/input.c b/net/sctp/input.c > index 6603853..2a192a7 100644 > --- a/net/sctp/input.c > +++ b/net/sctp/input.c > @@ -536,8 +536,7 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb, > return sk; > > out: > - if (asoc) > - sctp_association_put(asoc); > + sctp_association_put(asoc); > return NULL; > } > > @@ -545,8 +544,7 @@ out: > void sctp_err_finish(struct sock *sk, struct sctp_association *asoc) > { > sctp_bh_unlock_sock(sk); > - if (asoc) > - sctp_association_put(asoc); > + sctp_association_put(asoc); > } > > /* > -- > 1.7.12 > > > -- > 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 > Seems reasonable Acked-by: Neil Horman <nhorman@tuxdriver.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/11/2013 03:42 AM, Wang Weidong wrote: > In sctp_err_lookup, goto out while the asoc is not NULL, so remove the > check NULL. Also, in sctp_err_finish which called by sctp_v4_err and > sctp_v6_err, they pass asoc to sctp_err_finish while the asoc is not > NULL, so remove the check. > > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Acked-by: Vlad Yasevich <vyasevich@gmail.com> Thanks -vlad > --- > net/sctp/input.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/net/sctp/input.c b/net/sctp/input.c > index 6603853..2a192a7 100644 > --- a/net/sctp/input.c > +++ b/net/sctp/input.c > @@ -536,8 +536,7 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb, > return sk; > > out: > - if (asoc) > - sctp_association_put(asoc); > + sctp_association_put(asoc); > return NULL; > } > > @@ -545,8 +544,7 @@ out: > void sctp_err_finish(struct sock *sk, struct sctp_association *asoc) > { > sctp_bh_unlock_sock(sk); > - if (asoc) > - sctp_association_put(asoc); > + sctp_association_put(asoc); > } > > /* > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Wang Weidong <wangweidong1@huawei.com> Date: Wed, 11 Dec 2013 16:42:14 +0800 > In sctp_err_lookup, goto out while the asoc is not NULL, so remove the > check NULL. Also, in sctp_err_finish which called by sctp_v4_err and > sctp_v6_err, they pass asoc to sctp_err_finish while the asoc is not > NULL, so remove the check. > > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/input.c b/net/sctp/input.c index 6603853..2a192a7 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -536,8 +536,7 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb, return sk; out: - if (asoc) - sctp_association_put(asoc); + sctp_association_put(asoc); return NULL; } @@ -545,8 +544,7 @@ out: void sctp_err_finish(struct sock *sk, struct sctp_association *asoc) { sctp_bh_unlock_sock(sk); - if (asoc) - sctp_association_put(asoc); + sctp_association_put(asoc); } /*
In sctp_err_lookup, goto out while the asoc is not NULL, so remove the check NULL. Also, in sctp_err_finish which called by sctp_v4_err and sctp_v6_err, they pass asoc to sctp_err_finish while the asoc is not NULL, so remove the check. Signed-off-by: Wang Weidong <wangweidong1@huawei.com> --- net/sctp/input.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)