From patchwork Thu May 25 15:32:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 9748553 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EB1A601E9 for ; Thu, 25 May 2017 15:34:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F075283D0 for ; Thu, 25 May 2017 15:34:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13F5728401; Thu, 25 May 2017 15:34:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87E57283D0 for ; Thu, 25 May 2017 15:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965246AbdEYPeT (ORCPT ); Thu, 25 May 2017 11:34:19 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:43377 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424353AbdEYPcu (ORCPT ); Thu, 25 May 2017 11:32:50 -0400 Received: from static-50-53-32-2.bvtn.or.frontiernet.net ([50.53.32.2] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dDukr-0002yQ-B5; Thu, 25 May 2017 15:32:49 +0000 From: John Johansen To: linux-security-module@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 4/8] apparmor: use macro template to simplify namespace seq_files Date: Thu, 25 May 2017 08:32:21 -0700 Message-Id: <20170525153225.19070-5-john.johansen@canonical.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170525153225.19070-1-john.johansen@canonical.com> References: <20170525153225.19070-1-john.johansen@canonical.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: John Johansen Reviewed-by: Seth Arnold Reviewed-by: Kees Cook --- security/apparmor/apparmorfs.c | 53 +++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index c3cef2ed7ee2..efdc6e41c468 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -490,9 +490,27 @@ SEQ_PROFILE_FOPS(mode); SEQ_PROFILE_FOPS(attach); SEQ_PROFILE_FOPS(hash); +/* + * namespace based files + * several root files and + * policy/ * + */ +#define SEQ_NS_FOPS(NAME) \ +static int seq_ns_ ##NAME ##_open(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, seq_ns_ ##NAME ##_show, inode->i_private); \ +} \ + \ +static const struct file_operations seq_ns_ ##NAME ##_fops = { \ + .owner = THIS_MODULE, \ + .open = seq_ns_ ##NAME ##_open, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} \ -static int aa_fs_seq_show_ns_level(struct seq_file *seq, void *v) +static int seq_ns_level_show(struct seq_file *seq, void *v) { struct aa_ns *ns = aa_current_profile()->ns; @@ -501,20 +519,7 @@ static int aa_fs_seq_show_ns_level(struct seq_file *seq, void *v) return 0; } -static int aa_fs_seq_open_ns_level(struct inode *inode, struct file *file) -{ - return single_open(file, aa_fs_seq_show_ns_level, inode->i_private); -} - -static const struct file_operations aa_fs_ns_level = { - .owner = THIS_MODULE, - .open = aa_fs_seq_open_ns_level, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int aa_fs_seq_show_ns_name(struct seq_file *seq, void *v) +static int seq_ns_name_show(struct seq_file *seq, void *v) { struct aa_ns *ns = aa_current_profile()->ns; @@ -523,18 +528,8 @@ static int aa_fs_seq_show_ns_name(struct seq_file *seq, void *v) return 0; } -static int aa_fs_seq_open_ns_name(struct inode *inode, struct file *file) -{ - return single_open(file, aa_fs_seq_show_ns_name, inode->i_private); -} - -static const struct file_operations aa_fs_ns_name = { - .owner = THIS_MODULE, - .open = aa_fs_seq_open_ns_name, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +SEQ_NS_FOPS(level); +SEQ_NS_FOPS(name); /* policy/raw_data/ * file ops */ @@ -1363,8 +1358,8 @@ static struct aa_fs_entry aa_fs_entry_features[] = { static struct aa_fs_entry aa_fs_entry_apparmor[] = { AA_FS_FILE_FOPS(".access", 0640, &aa_fs_access), - AA_FS_FILE_FOPS(".ns_level", 0666, &aa_fs_ns_level), - AA_FS_FILE_FOPS(".ns_name", 0640, &aa_fs_ns_name), + AA_FS_FILE_FOPS(".ns_level", 0666, &seq_ns_level_fops), + AA_FS_FILE_FOPS(".ns_name", 0640, &seq_ns_name_fops), AA_FS_FILE_FOPS("profiles", 0440, &aa_fs_profiles_fops), AA_FS_DIR("features", aa_fs_entry_features), { }