From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gao feng Subject: Re: [PATCH] audit: fix build error when disable audit Date: Fri, 20 Dec 2013 09:39:55 +0800 Message-ID: <52B39FEB.8030308@cn.fujitsu.com> References: <1387420469-27665-1-git-send-email-gaofeng@cn.fujitsu.com> <52B25CA8.8090806@cn.fujitsu.com> <20131220011956.GA14944@madcap2.tricolour.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20131220011956.GA14944@madcap2.tricolour.ca> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: Richard Guy Briggs Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com T24gMTIvMjAvMjAxMyAwOToxOSBBTSwgUmljaGFyZCBHdXkgQnJpZ2dzIHdyb3RlOgo+IE9uIDEz LzEyLzE5LCBHYW8gZmVuZyB3cm90ZToKPj4gT24gMTIvMTkvMjAxMyAxMDozNCBBTSwgR2FvIGZl bmcgd3JvdGU6Cj4+PiBrZXJuZWwvY2FwYWJpbGl0eS5jOiBJbiBmdW5jdGlvbiDigJhTWVNDX2Nh cHNldOKAmToKPj4+IGtlcm5lbC9jYXBhYmlsaXR5LmM6MjgwOjI6IHdhcm5pbmc6IHBhc3Npbmcg YXJndW1lbnQgMSBvZiDigJhhdWRpdF9sb2dfY2Fwc2V04oCZIG1ha2VzIGludGVnZXIgZnJvbSBw b2ludGVyIHdpdGhvdXQgYSBjYXN0IFtlbmFibGVkIGJ5IGRlZmF1bHRdCj4+PiAgIGF1ZGl0X2xv Z19jYXBzZXQobmV3LCBjdXJyZW50X2NyZWQoKSk7Cj4+PiAgIF4KPj4+IEluIGZpbGUgaW5jbHVk ZWQgZnJvbSBrZXJuZWwvY2FwYWJpbGl0eS5jOjEwOjA6Cj4+PiBpbmNsdWRlL2xpbnV4L2F1ZGl0 Lmg6NDAwOjIwOiBub3RlOiBleHBlY3RlZCDigJhwaWRfdOKAmSBidXQgYXJndW1lbnQgaXMgb2Yg dHlwZSDigJhzdHJ1Y3QgY3JlZCAq4oCZCj4+PiAgc3RhdGljIGlubGluZSB2b2lkIGF1ZGl0X2xv Z19jYXBzZXQocGlkX3QgcGlkLCBjb25zdCBzdHJ1Y3QgY3JlZCAqbmV3LAo+Pj4gICAgICAgICAg ICAgICAgICAgICBeCj4+PiBrZXJuZWwvY2FwYWJpbGl0eS5jOjI4MDoyOiBlcnJvcjogdG9vIGZl dyBhcmd1bWVudHMgdG8gZnVuY3Rpb24g4oCYYXVkaXRfbG9nX2NhcHNldOKAmQo+Pj4gICBhdWRp dF9sb2dfY2Fwc2V0KG5ldywgY3VycmVudF9jcmVkKCkpOwo+Pj4gICBeCj4+PiBJbiBmaWxlIGlu Y2x1ZGVkIGZyb20ga2VybmVsL2NhcGFiaWxpdHkuYzoxMDowOgo+Pj4gaW5jbHVkZS9saW51eC9h dWRpdC5oOjQwMDoyMDogbm90ZTogZGVjbGFyZWQgaGVyZQo+Pj4gIHN0YXRpYyBpbmxpbmUgdm9p ZCBhdWRpdF9sb2dfY2Fwc2V0KHBpZF90IHBpZCwgY29uc3Qgc3RydWN0IGNyZWQgKm5ldywKPj4+ ICAgICAgICAgICAgICAgICAgICAgXgo+Pj4gbWFrZVsxXTogKioqIFtrZXJuZWwvY2FwYWJpbGl0 eS5vXSBFcnJvciAxCj4+Cj4+IEJUVywgYnVnIGludHJvZHVjZWQgYnkgY29tbW1pdCAyNmI4MWVi NDA4YzQxMWQ4NmM3Y2M5MzI3OGZiODhmYmNkNzg1ZjY1Cj4+IGF1ZGl0OiBTaW1wbGlmeSBhbmQg Y29ycmVjdCBhdWRpdF9sb2dfY2Fwc2V0Cj4gCj4gWXVwLCBmb3VuZCBpdC4gIFRoYW5rcyBmb3Ig dGhlIHBhdGNoLiAgU2luY2UgaXQgaXNuJ3QgdXBzdHJlYW0geWV0LCBJCj4gbWF5IG1lcmdlIGl0 IGFuZCByZWJhc2UgZm9yIGxpbnV4LW5leHQuCj4gCgp0aGFuayB5b3UgUmljaGFyZCwgYnR3LCBk byB5b3UgaGF2ZSBwbGFuIHRvIHB1c2ggdGhlc2UgY2hhbmdlcyB0byB0aGUgbGludXgtbmV4dD8K CgotLQpMaW51eC1hdWRpdCBtYWlsaW5nIGxpc3QKTGludXgtYXVkaXRAcmVkaGF0LmNvbQpodHRw czovL3d3dy5yZWRoYXQuY29tL21haWxtYW4vbGlzdGluZm8vbGludXgtYXVkaXQ= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932154Ab3LTBjX (ORCPT ); Thu, 19 Dec 2013 20:39:23 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:55330 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756904Ab3LTBjV convert rfc822-to-8bit (ORCPT ); Thu, 19 Dec 2013 20:39:21 -0500 X-IronPort-AV: E=Sophos;i="4.95,516,1384272000"; d="scan'208";a="9294487" Message-ID: <52B39FEB.8030308@cn.fujitsu.com> Date: Fri, 20 Dec 2013 09:39:55 +0800 From: Gao feng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Richard Guy Briggs CC: linux-audit@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] audit: fix build error when disable audit References: <1387420469-27665-1-git-send-email-gaofeng@cn.fujitsu.com> <52B25CA8.8090806@cn.fujitsu.com> <20131220011956.GA14944@madcap2.tricolour.ca> In-Reply-To: <20131220011956.GA14944@madcap2.tricolour.ca> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/12/20 09:38:25, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/12/20 09:38:26 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/20/2013 09:19 AM, Richard Guy Briggs wrote: > On 13/12/19, Gao feng wrote: >> On 12/19/2013 10:34 AM, Gao feng wrote: >>> kernel/capability.c: In function ‘SYSC_capset’: >>> kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default] >>> audit_log_capset(new, current_cred()); >>> ^ >>> In file included from kernel/capability.c:10:0: >>> include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’ >>> static inline void audit_log_capset(pid_t pid, const struct cred *new, >>> ^ >>> kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’ >>> audit_log_capset(new, current_cred()); >>> ^ >>> In file included from kernel/capability.c:10:0: >>> include/linux/audit.h:400:20: note: declared here >>> static inline void audit_log_capset(pid_t pid, const struct cred *new, >>> ^ >>> make[1]: *** [kernel/capability.o] Error 1 >> >> BTW, bug introduced by commmit 26b81eb408c411d86c7cc93278fb88fbcd785f65 >> audit: Simplify and correct audit_log_capset > > Yup, found it. Thanks for the patch. Since it isn't upstream yet, I > may merge it and rebase for linux-next. > thank you Richard, btw, do you have plan to push these changes to the linux-next?