Subject: [to-be-updated] misdn-add-support-for-group-membership-check.patch removed from -mm tree
To: jeffm@xxxxxxxx,davem@xxxxxxxxxxxxx,isdn4linux@xxxxxxxxx,isdn@xxxxxxxxxxxxxx,jslaby@xxxxxxx,sergei.shtylyov@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 16 Sep 2013 14:22:55 -0700
The patch titled
Subject: mISDN: add support for group membership check
has been removed from the -mm tree. Its filename was
misdn-add-support-for-group-membership-check.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Jeff Mahoney <jeffm@xxxxxxxx>
Subject: mISDN: add support for group membership check
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.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Acked-by: Jeff Mahoney <jeffm@xxxxxxxx>
Cc: Patrick Koppen <isdn4linux@xxxxxxxxx>
Cc: Karsten Keil <isdn@xxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/isdn/mISDN/core.c | 6 ++++++
drivers/isdn/mISDN/core.h | 1 +
drivers/isdn/mISDN/socket.c | 9 +++++++++
3 files changed, 16 insertions(+)
diff -puN drivers/isdn/mISDN/core.c~misdn-add-support-for-group-membership-check drivers/isdn/mISDN/core.c
--- a/drivers/isdn/mISDN/core.c~misdn-add-support-for-group-membership-check
+++ a/drivers/isdn/mISDN/core.c
@@ -21,10 +21,14 @@
#include "core.h"
static u_int debug;
+static u_int gid;
+kgid_t misdn_permitted_gid;
MODULE_AUTHOR("Karsten Keil");
MODULE_LICENSE("GPL");
module_param(debug, uint, S_IRUGO | S_IWUSR);
+module_param(gid, uint, 0);
+MODULE_PARM_DESC(gid, "Unix group for accessing misdn socket (default 0)");
static u64 device_ids;
#define MAX_DEVICE_ID 63
@@ -372,6 +376,8 @@ mISDNInit(void)
{
int err;
+ misdn_permitted_gid = make_kgid(current_user_ns(), gid);
+
printk(KERN_INFO "Modular ISDN core version %d.%d.%d\n",
MISDN_MAJOR_VERSION, MISDN_MINOR_VERSION, MISDN_RELEASE);
mISDN_init_clock(&debug);
diff -puN drivers/isdn/mISDN/core.h~misdn-add-support-for-group-membership-check drivers/isdn/mISDN/core.h
--- a/drivers/isdn/mISDN/core.h~misdn-add-support-for-group-membership-check
+++ a/drivers/isdn/mISDN/core.h
@@ -17,6 +17,7 @@
extern struct mISDNdevice *get_mdevice(u_int);
extern int get_mdevice_count(void);
+extern kgid_t misdn_permitted_gid;
/* stack status flag */
#define mISDN_STACK_ACTION_MASK 0x0000ffff
diff -puN drivers/isdn/mISDN/socket.c~misdn-add-support-for-group-membership-check drivers/isdn/mISDN/socket.c
--- a/drivers/isdn/mISDN/socket.c~misdn-add-support-for-group-membership-check
+++ a/drivers/isdn/mISDN/socket.c
@@ -612,6 +612,11 @@ data_sock_create(struct net *net, struct
{
struct sock *sk;
+ if (!capable(CAP_SYS_ADMIN) &&
+ !gid_eq(misdn_permitted_gid, current_gid()) &&
+ !in_group_p(misdn_permitted_gid))
+ return -EPERM;
+
if (sock->type != SOCK_DGRAM)
return -ESOCKTNOSUPPORT;
@@ -694,6 +699,10 @@ base_sock_ioctl(struct socket *sock, uns
case IMSETDEVNAME:
{
struct mISDN_devrename dn;
+ if (!capable(CAP_SYS_ADMIN) &&
+ !gid_eq(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;
_
Patches currently in -mm which might be from jeffm@xxxxxxxx are
origin.patch
drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo.patch
drivers-net-ethernet-ibm-ehea-ehea_mainc-add-alias-entry-for-portn-properties.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
