From patchwork Tue Jul 23 20:59:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11055319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B9D8C912 for ; Tue, 23 Jul 2019 20:59:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A810B28724 for ; Tue, 23 Jul 2019 20:59:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9857628738; Tue, 23 Jul 2019 20:59:38 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 118D028724 for ; Tue, 23 Jul 2019 20:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391897AbfGWU7h (ORCPT ); Tue, 23 Jul 2019 16:59:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:38738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389103AbfGWU7h (ORCPT ); Tue, 23 Jul 2019 16:59:37 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A166B2253D; Tue, 23 Jul 2019 20:59:36 +0000 (UTC) Date: Tue, 23 Jul 2019 16:59:35 -0400 From: Steven Rostedt To: Linux Trace Devel Cc: Yordan Karadzhov Subject: [PATCH] kernel-shark: Suppress "Root privileges are required" if already root Message-ID: <20190723165935.300f58e8@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Steven Rostedt (VMware) If the tracefs directory is configured into the kernel, and kshark-record fails to find the tracing directory, it should test if it already has root privileges (geteuid() returns zero), before posting a message "Root privileges are required" as that can confuse users. Reported-by: howaboutsynergy@pm.me Signed-off-by: Steven Rostedt (VMware) Reviewed-by: Yordan Karadzhov (VMware) diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp index 2e6e8f9c..dbf73302 100644 --- a/kernel-shark/src/KsCaptureDialog.cpp +++ b/kernel-shark/src/KsCaptureDialog.cpp @@ -18,6 +18,12 @@ #include "KsCmakeDef.hpp" #include "KsCaptureDialog.hpp" +extern "C" { + // To get access to geteuid() + #include + #include +} + static inline tep_handle *local_events() { return tracecmd_local_events(tracecmd_get_tracing_dir()); @@ -65,7 +71,9 @@ KsCaptureControl::KsCaptureControl(QWidget *parent) if (!_localTEP) message += "Cannot find or mount tracing directory.\n"; - if (!pluginList.count()) + + // geteuid() returns 0 if running as effective id of root + if (!pluginList.count() && geteuid()) message += "Root privileges are required.\n"; QLabel *errorLabel = new QLabel(message);