From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422969AbbEUQZk (ORCPT ); Thu, 21 May 2015 12:25:40 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:28486 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161057AbbEUQZD (ORCPT ); Thu, 21 May 2015 12:25:03 -0400 X-AuditID: cbfec7f5-f794b6d000001495-3a-555e06ddf6df From: Rafal Krypa To: Casey Schaufler Cc: James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Rafal Krypa Subject: [PATCH 1/2] Smack: fix seq operations in smackfs Date: Thu, 21 May 2015 18:24:31 +0200 Message-id: <1432225472-5186-2-git-send-email-r.krypa@samsung.com> X-Mailer: git-send-email 2.1.4 In-reply-to: <1432225472-5186-1-git-send-email-r.krypa@samsung.com> References: <1432225472-5186-1-git-send-email-r.krypa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphluLIzCtJLcpLzFFi42I5/e/4Vd27bHGhBi+WsVnc2/aLzaLvcZDF 5V1z2Cw+9Dxis3g7aQWzxfkL59gd2Dyu7Y70+Pj0FotH35ZVjB5H9y9i8/i8SS6ANYrLJiU1 J7MstUjfLoErY/mzmILzmhW/dv9lbGD8oNjFyMEhIWAisfCAVRcjJ5ApJnHh3nq2LkYuDiGB pYwSrw5tYoVwGpkkfv5bxQ5SxSagLrF0fi8biC0ioCOxb89zdpAiZoF9jBIn9uxnAUkIC1hK LJu5hxHEZhFQlTh2/CWYzSvgJPHvDcQgCQE5ifPHfzKD2JwCzhLXt99nArGFgGoaPy9mm8DI u4CRYRWjaGppckFxUnqukV5xYm5xaV66XnJ+7iZGSBh93cG49JjVIUYBDkYlHt4NKrGhQqyJ ZcWVuYcYJTiYlUR4174GCvGmJFZWpRblxxeV5qQWH2KU5mBREueduet9iJBAemJJanZqakFq EUyWiYNTqoHRzOP+40f9XJtF+ZK/XVq07iR/TlP0vjn/nTR6Dt68YhJaqeIX+r/sS3TdAf2o uRr1ar1vGbwX+O/TerLyVLyshE//xfV6eR+UOj+vNhQX6zGZUdC6cPoji1/byr4f8/Za4+9+ uinr4c0DOnNdmbjFE898vugsejyqydulZI+mV0ntZoUr8+4qsRRnJBpqMRcVJwIA0kP9vx8C AAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use proper RCU functions and read locking in smackfs seq_operations. Smack gets away with not using proper RCU functions in smackfs, because it never removes entries from these lists. But now one list will be needed (with interface in smackfs) that will have both elements added and removed to it. This change will also help any future changes implementing removal of unneeded entries from other Smack lists. The patch also fixes handling of pos argument in smk_seq_start and smk_seq_next. This fixes a bug in case when smackfs is read with a small buffer: Kernel panic - not syncing: Kernel mode fault at addr 0xfa0000011b CPU: 0 PID: 1292 Comm: dd Not tainted 4.1.0-rc1-00012-g98179b8 #13 Stack: 00000003 0000000d 7ff39e48 7f69fd00 7ff39ce0 601ae4b0 7ff39d50 600e587b 00000010 6039f690 7f69fd40 00612003 Call Trace: [<601ae4b0>] load2_seq_show+0x19/0x1d [<600e587b>] seq_read+0x168/0x331 [<600c5943>] __vfs_read+0x21/0x101 [<601a595e>] ? security_file_permission+0xf8/0x105 [<600c5ec6>] ? rw_verify_area+0x86/0xe2 [<600c5fc3>] vfs_read+0xa1/0x14c [<600c68e2>] SyS_read+0x57/0xa0 [<6001da60>] handle_syscall+0x60/0x80 [<6003087d>] userspace+0x442/0x548 [<6001aa77>] ? interrupt_end+0x0/0x80 [<6001daae>] ? copy_chunk_to_user+0x0/0x2b [<6002cb6b>] ? save_registers+0x1f/0x39 [<60032ef7>] ? arch_prctl+0xf5/0x170 [<6001a92d>] fork_handler+0x85/0x87 Signed-off-by: Rafal Krypa --- security/smack/smackfs.c | 52 ++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 3e42426..e40dc48 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -566,23 +566,17 @@ static void *smk_seq_start(struct seq_file *s, loff_t *pos, struct list_head *head) { struct list_head *list; + int i = *pos; + + rcu_read_lock(); + for (list = rcu_dereference(list_next_rcu(head)); + list != head; + list = rcu_dereference(list_next_rcu(list))) { + if (i-- == 0) + return list; + } - /* - * This is 0 the first time through. - */ - if (s->index == 0) - s->private = head; - - if (s->private == NULL) - return NULL; - - list = s->private; - if (list_empty(list)) - return NULL; - - if (s->index == 0) - return list->next; - return list; + return NULL; } static void *smk_seq_next(struct seq_file *s, void *v, loff_t *pos, @@ -590,17 +584,15 @@ static void *smk_seq_next(struct seq_file *s, void *v, loff_t *pos, { struct list_head *list = v; - if (list_is_last(list, head)) { - s->private = NULL; - return NULL; - } - s->private = list->next; - return list->next; + ++*pos; + list = rcu_dereference(list_next_rcu(list)); + + return (list == head) ? NULL : list; } static void smk_seq_stop(struct seq_file *s, void *v) { - /* No-op */ + rcu_read_unlock(); } static void smk_rule_show(struct seq_file *s, struct smack_rule *srp, int max) @@ -660,7 +652,7 @@ static int load_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smack_master_list *smlp = - list_entry(list, struct smack_master_list, list); + list_entry_rcu(list, struct smack_master_list, list); smk_rule_show(s, smlp->smk_rule, SMK_LABELLEN); @@ -808,7 +800,7 @@ static int cipso_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smack_known *skp = - list_entry(list, struct smack_known, list); + list_entry_rcu(list, struct smack_known, list); struct netlbl_lsm_catmap *cmp = skp->smk_netlabel.attr.mls.cat; char sep = '/'; int i; @@ -999,7 +991,7 @@ static int cipso2_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smack_known *skp = - list_entry(list, struct smack_known, list); + list_entry_rcu(list, struct smack_known, list); struct netlbl_lsm_catmap *cmp = skp->smk_netlabel.attr.mls.cat; char sep = '/'; int i; @@ -1083,7 +1075,7 @@ static int netlbladdr_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smk_netlbladdr *skp = - list_entry(list, struct smk_netlbladdr, list); + list_entry_rcu(list, struct smk_netlbladdr, list); unsigned char *hp = (char *) &skp->smk_host.sin_addr.s_addr; int maskn; u32 temp_mask = be32_to_cpu(skp->smk_mask.s_addr); @@ -1917,7 +1909,7 @@ static int load_self_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smack_rule *srp = - list_entry(list, struct smack_rule, list); + list_entry_rcu(list, struct smack_rule, list); smk_rule_show(s, srp, SMK_LABELLEN); @@ -2046,7 +2038,7 @@ static int load2_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smack_master_list *smlp = - list_entry(list, struct smack_master_list, list); + list_entry_rcu(list, struct smack_master_list, list); smk_rule_show(s, smlp->smk_rule, SMK_LONGLABEL); @@ -2123,7 +2115,7 @@ static int load_self2_seq_show(struct seq_file *s, void *v) { struct list_head *list = v; struct smack_rule *srp = - list_entry(list, struct smack_rule, list); + list_entry_rcu(list, struct smack_rule, list); smk_rule_show(s, srp, SMK_LONGLABEL); -- 2.1.4