From: Jiri Slaby <jslaby@suse.cz>
To: jirislaby@gmail.com
Cc: linux-kernel@vger.kernel.org, Jeff Mahoney <jeffm@suse.com>,
Patrick Koppen <isdn4linux@koppen.de>,
Jiri Slaby <jslaby@suse.cz>, Karsten Keil <isdn@linux-pingi.de>,
netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH 02/15] mISDN: Add support for group membership check
Date: Tue, 7 May 2013 16:18:10 +0200 [thread overview]
Message-ID: <1367936303-13386-2-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <1367936303-13386-1-git-send-email-jslaby@suse.cz>
From: Jeff Mahoney <jeffm@suse.com>
This patch adds a module parameter to allow a group access to the
mISDN devices. Otherwise, unpriviledged users on systems with ISDN
hardware have the ability to dial out, potentially causing expensive
bills.
Based on a different implementation by Patrick Koppen <isdn4linux@koppen.de>
We (at suse) have this patch in our trees at least since 2009 and want
to push it upstream now.
Acked-by: Jeff Mahoney <jeffm@suse.com>
Cc: Patrick Koppen <isdn4linux@koppen.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
---
drivers/isdn/mISDN/core.c | 3 +++
drivers/isdn/mISDN/core.h | 1 +
drivers/isdn/mISDN/socket.c | 8 ++++++++
3 files changed, 12 insertions(+)
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c
index da30c5c..a7050c3 100644
--- a/drivers/isdn/mISDN/core.c
+++ b/drivers/isdn/mISDN/core.c
@@ -21,10 +21,13 @@
#include "core.h"
static u_int debug;
+u_int misdn_permitted_gid;
MODULE_AUTHOR("Karsten Keil");
MODULE_LICENSE("GPL");
module_param(debug, uint, S_IRUGO | S_IWUSR);
+module_param_named(gid, misdn_permitted_gid, uint, 0);
+MODULE_PARM_DESC(gid, "Unix group for accessing misdn socket (default 0)");
static u64 device_ids;
#define MAX_DEVICE_ID 63
diff --git a/drivers/isdn/mISDN/core.h b/drivers/isdn/mISDN/core.h
index 52695bb..6ea673f 100644
--- a/drivers/isdn/mISDN/core.h
+++ b/drivers/isdn/mISDN/core.h
@@ -17,6 +17,7 @@
extern struct mISDNdevice *get_mdevice(u_int);
extern int get_mdevice_count(void);
+extern u_int misdn_permitted_gid;
/* stack status flag */
#define mISDN_STACK_ACTION_MASK 0x0000ffff
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index e47dcb9..71f4986 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -612,6 +612,10 @@ data_sock_create(struct net *net, struct socket *sock, int protocol)
{
struct sock *sk;
+ if(!capable(CAP_SYS_ADMIN) && (misdn_permitted_gid != current_gid())
+ && (!in_group_p(misdn_permitted_gid)))
+ return -EPERM;
+
if (sock->type != SOCK_DGRAM)
return -ESOCKTNOSUPPORT;
@@ -694,6 +698,10 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case IMSETDEVNAME:
{
struct mISDN_devrename dn;
+ if(!capable(CAP_SYS_ADMIN)
+ && (misdn_permitted_gid != current_gid())
+ && (!in_group_p(misdn_permitted_gid)))
+ return -EPERM;
if (copy_from_user(&dn, (void __user *)arg,
sizeof(dn))) {
err = -EFAULT;
--
1.8.2.1
next prev parent reply other threads:[~2013-05-07 14:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 14:18 [PATCH 01/15] Char: lp, protect LPGETSTATUS with port_mutex Jiri Slaby
2013-05-07 14:18 ` Jiri Slaby [this message]
2013-05-07 14:18 ` [PATCH 03/15] ehea: add alias entry for portN properties Jiri Slaby
2013-05-07 14:18 ` [PATCH 04/15] drm/cirrus: Correct register values for 16bpp Jiri Slaby
2013-05-07 14:18 ` [PATCH 05/15] connection tracking helper for SLP Jiri Slaby
2013-05-08 2:03 ` Pablo Neira Ayuso
2013-05-07 14:18 ` [PATCH 06/15] netfilter: Implement RFC 1123 for FTP conntrack Jiri Slaby
2013-05-07 14:18 ` [PATCH 07/15] hfs: avoid crash in hfs_bnode_create Jiri Slaby
2013-05-07 19:05 ` Vyacheslav Dubeyko
2013-05-08 15:26 ` [PATCH v2 07/14] " Jiri Slaby
2013-05-07 14:18 ` [PATCH 08/15] reiserfs: fix deadlock with nfs racing on create/lookup Jiri Slaby
2013-05-07 14:18 ` [PATCH 09/15] Make selection of 'readdir-plus' adapt to usage patterns Jiri Slaby
2013-05-07 14:27 ` Myklebust, Trond
2013-05-07 14:32 ` Jiri Slaby
2013-05-07 14:18 ` [PATCH 10/15] acpi: ec_sys: access user space with get_user()/put_user() Jiri Slaby
2013-05-07 14:18 ` [PATCH 11/15] nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO Jiri Slaby
2013-05-07 14:18 ` [PATCH 12/15] geodefb: Depend on X86_32 Jiri Slaby
2013-05-07 14:18 ` [PATCH 13/15] chipidea: Allow user to select PCI/IMX options Jiri Slaby
2013-05-08 9:07 ` Alexander Shishkin
2013-05-15 15:59 ` Jiri Slaby
2013-05-16 9:36 ` Alexander Shishkin
2013-05-22 8:51 ` Jiri Slaby
2013-05-22 11:10 ` Alexander Shishkin
2013-05-07 14:18 ` [PATCH 14/15] staging/sb105x: remove asm/segment.h dependency Jiri Slaby
2013-05-07 14:18 ` [PATCH 15/15] ptp: PTP_1588_CLOCK_PCH depends on x86 Jiri Slaby
2013-05-07 19:29 ` Richard Cochran
2013-05-14 14:20 ` Jiri Slaby
2013-05-14 18:12 ` Ben Hutchings
2013-05-20 22:31 ` Keller, Jacob E
2013-05-07 14:48 ` [PATCH 01/15] Char: lp, protect LPGETSTATUS with port_mutex Arnd Bergmann
2013-05-07 15:41 ` Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367936303-13386-2-git-send-email-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=davem@davemloft.net \
--cc=isdn4linux@koppen.de \
--cc=isdn@linux-pingi.de \
--cc=jeffm@suse.com \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®