From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rui Xiang Subject: [PATCH v3 06/11] syslog_ns: use init syslog_ns for console action Date: Wed, 7 Aug 2013 15:37:10 +0800 Message-ID: <1375861035-24320-7-git-send-email-rui.xiang@huawei.com> References: <1375861035-24320-1-git-send-email-rui.xiang@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, serge.hallyn-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org, libo.chen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org, netfilter-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org, guz.fnst-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org To: , Return-path: In-Reply-To: <1375861035-24320-1-git-send-email-rui.xiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: netdev.vger.kernel.org While flags SYSLOG_ACTION_CONSOLE_ON/OFF/LEVEL of console actin are used in syslog syscall, the related hanlding should be targeted at host by init_syslog_ns. Signed-off-by: Rui Xiang --- kernel/printk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/printk.c b/kernel/printk.c index ca951e7..bdb7ed4 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -373,6 +373,11 @@ static int check_syslog_permissions(int type, bool from_file, if (from_file && type != SYSLOG_ACTION_OPEN) return 0; + if (type == SYSLOG_ACTION_CONSOLE_OFF + || type == SYSLOG_ACTION_CONSOLE_ON + || type == SYSLOG_ACTION_CONSOLE_LEVEL) + ns = &init_syslog_ns; + if (syslog_action_restricted(type, ns)) { if (ns_capable(ns->owner, CAP_SYSLOG)) return 0; -- 1.8.2.2