* [PATCH] kernel-audit: Delete unnecessary checks before two function calls [not found] ` <5317A59D.4@users.sourceforge.net> @ 2015-11-15 11:42 ` SF Markus Elfring 2015-11-19 20:53 ` Paul Moore 0 siblings, 1 reply; 2+ messages in thread From: SF Markus Elfring @ 2015-11-15 11:42 UTC (permalink / raw) To: Eric Paris, Paul Moore, linux-audit; +Cc: LKML, kernel-janitors, Julia Lawall From: Markus Elfring <elfring@users.sourceforge.net> Date: Sun, 15 Nov 2015 12:38:33 +0100 The functions consume_skb() and kfree_skb() test whether their argument is NULL and then return immediately. Thus the tests around their calls are not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- kernel/audit.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 5ffcbd3..1e8e228 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -509,8 +509,7 @@ static void flush_hold_queue(void) * if auditd just disappeared but we * dequeued an skb we need to drop ref */ - if (skb) - consume_skb(skb); + consume_skb(skb); } static int kauditd_thread(void *dummy) @@ -1232,9 +1231,7 @@ static void audit_buffer_free(struct audit_buffer *ab) if (!ab) return; - if (ab->skb) - kfree_skb(ab->skb); - + kfree_skb(ab->skb); spin_lock_irqsave(&audit_freelist_lock, flags); if (audit_freelist_count > AUDIT_MAXFREE) kfree(ab); -- 2.6.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kernel-audit: Delete unnecessary checks before two function calls 2015-11-15 11:42 ` [PATCH] kernel-audit: Delete unnecessary checks before two function calls SF Markus Elfring @ 2015-11-19 20:53 ` Paul Moore 0 siblings, 0 replies; 2+ messages in thread From: Paul Moore @ 2015-11-19 20:53 UTC (permalink / raw) To: SF Markus Elfring Cc: Eric Paris, linux-audit, LKML, kernel-janitors, Julia Lawall On Sunday, November 15, 2015 12:42:52 PM SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sun, 15 Nov 2015 12:38:33 +0100 > > The functions consume_skb() and kfree_skb() test whether their argument > is NULL and then return immediately. > Thus the tests around their calls are not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > kernel/audit.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) Merged, thanks. > diff --git a/kernel/audit.c b/kernel/audit.c > index 5ffcbd3..1e8e228 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -509,8 +509,7 @@ static void flush_hold_queue(void) > * if auditd just disappeared but we > * dequeued an skb we need to drop ref > */ > - if (skb) > - consume_skb(skb); > + consume_skb(skb); > } > > static int kauditd_thread(void *dummy) > @@ -1232,9 +1231,7 @@ static void audit_buffer_free(struct audit_buffer *ab) > if (!ab) > return; > > - if (ab->skb) > - kfree_skb(ab->skb); > - > + kfree_skb(ab->skb); > spin_lock_irqsave(&audit_freelist_lock, flags); > if (audit_freelist_count > AUDIT_MAXFREE) > kfree(ab); -- paul moore www.paul-moore.com ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-19 20:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <5307CAA2.8060406@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402212321410.2043@localhost6.localdomain6>
[not found] ` <530A086E.8010901@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402231635510.1985@localhost6.localdomain6>
[not found] ` <530A72AA.3000601@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402240658210.2090@localhost6.localdomain6>
[not found] ` <530B5FB6.6010207@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402241710370.2074@hadrien>
[not found] ` <530C5E18.1020800@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402251014170.2080@hadrien>
[not found] ` <530CD2C4.4050903@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402251840450.7035@hadrien>
[not found] ` <530CF8FF.8080600@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402252117150.2047@localhost6.localdomain6>
[not found] ` <530DD06F.4090703@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402262129250.2221@localhost6.localdomain6>
[not found] ` <5317A59D.4@users.sourceforge.net>
2015-11-15 11:42 ` [PATCH] kernel-audit: Delete unnecessary checks before two function calls SF Markus Elfring
2015-11-19 20:53 ` Paul Moore
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox