| Message ID | 54CD0DCF.9020804@users.sourceforge.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Jan 31, 2015 at 06:15:59PM +0100, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sat, 31 Jan 2015 18:10:03 +0100 > > The kfree() function tests whether its argument is NULL and then > returns immediately. Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > net/sctp/associola.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/sctp/associola.c b/net/sctp/associola.c > index f791edd..3c2aefc 100644 > --- a/net/sctp/associola.c > +++ b/net/sctp/associola.c > @@ -391,8 +391,7 @@ void sctp_association_free(struct sctp_association *asoc) > sctp_asconf_queue_teardown(asoc); > > /* Free pending address space being deleted */ > - if (asoc->asconf_addr_del_pending != NULL) > - kfree(asoc->asconf_addr_del_pending); > + kfree(asoc->asconf_addr_del_pending); > > /* AUTH - Free the endpoint shared keys */ > sctp_auth_destroy_keys(&asoc->endpoint_shared_keys); > -- > 2.2.2 > > Sure, 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
From: SF Markus Elfring <elfring@users.sourceforge.net> Date: Sat, 31 Jan 2015 18:15:59 +0100 > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sat, 31 Jan 2015 18:10:03 +0100 > > The kfree() function tests whether its argument is NULL and then > returns immediately. Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Applied to net-next, 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/associola.c b/net/sctp/associola.c index f791edd..3c2aefc 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -391,8 +391,7 @@ void sctp_association_free(struct sctp_association *asoc) sctp_asconf_queue_teardown(asoc); /* Free pending address space being deleted */ - if (asoc->asconf_addr_del_pending != NULL) - kfree(asoc->asconf_addr_del_pending); + kfree(asoc->asconf_addr_del_pending); /* AUTH - Free the endpoint shared keys */ sctp_auth_destroy_keys(&asoc->endpoint_shared_keys);