From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94C0DC2BA83 for ; Wed, 12 Feb 2020 14:29:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 588B4206D7 for ; Wed, 12 Feb 2020 14:29:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbgBLO3k (ORCPT ); Wed, 12 Feb 2020 09:29:40 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:16365 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727851AbgBLO3k (ORCPT ); Wed, 12 Feb 2020 09:29:40 -0500 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01CEOlDh092191 for ; Wed, 12 Feb 2020 09:29:38 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0b-001b2d01.pphosted.com with ESMTP id 2y3wxsufkh-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Feb 2020 09:29:38 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Feb 2020 14:29:37 -0000 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 12 Feb 2020 14:29:33 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01CEScSX31129976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Feb 2020 14:28:38 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BADD313A15D; Wed, 12 Feb 2020 14:29:32 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D075013A157; Wed, 12 Feb 2020 14:29:31 +0000 (GMT) Received: from localhost.localdomain (unknown [9.80.205.134]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 12 Feb 2020 14:29:31 +0000 (GMT) Subject: Re: [PATCH v3 3/3] IMA: Add module name and base name prefix to log. From: Mimi Zohar To: Tushar Sugandhi , joe@perches.com, skhan@linuxfoundation.org, linux-integrity@vger.kernel.org Cc: sashal@kernel.org, nramas@linux.microsoft.com, linux-kernel@vger.kernel.org Date: Wed, 12 Feb 2020 09:29:30 -0500 In-Reply-To: <20200211231414.6640-4-tusharsu@linux.microsoft.com> References: <20200211231414.6640-1-tusharsu@linux.microsoft.com> <20200211231414.6640-4-tusharsu@linux.microsoft.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 20021214-4275-0000-0000-000003A071B2 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20021214-4276-0000-0000-000038B4AD1C Message-Id: <1581517770.8515.35.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-12_07:2020-02-11,2020-02-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 suspectscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002120113 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2020-02-11 at 15:14 -0800, Tushar Sugandhi wrote: > The #define for formatting log messages, pr_fmt, is duplicated in the > files under security/integrity. > > This change moves the definition to security/integrity/integrity.h and > removes the duplicate definitions in the other files under > security/integrity. Also, it adds KBUILD_MODNAME and KBUILD_BASENAME prefix > to the log messages. > > Signed-off-by: Tushar Sugandhi > Reviewed-by: Lakshmi Ramasubramanian > Suggested-by: Joe Perches > Suggested-by: Shuah Khan > diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h > index 73fc286834d7..b1bb4d2263be 100644 > --- a/security/integrity/integrity.h > +++ b/security/integrity/integrity.h > @@ -6,6 +6,12 @@ > * Mimi Zohar > */ > > +#ifdef pr_fmt > +#undef pr_fmt > +#endif > + > +#define pr_fmt(fmt) KBUILD_MODNAME ": " KBUILD_BASENAME ": " fmt > + > #include > #include > #include Joe, Shuah, including the pr_fmt() in integrity/integrity.h not only affects the integrity directory but everything below it.  Adding KBUILD_BASENAME to pr_fmt() modifies all of the existing IMA and EVM kernel messages.  Is that ok or should there be a separate pr_fmt() for the subdirectories? thanks, Mimi