diff options
| author | Kees Cook <keescook@chromium.org> | 2013-02-25 21:32:25 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-20 15:03:18 +0000 |
| commit | 7c4bf08d3fa22613b628fc967953f581564a13ad (patch) | |
| tree | adb72d50ec0c3b9b37902742ab20400497a71d26 /drivers/connector | |
| parent | ab94b06b25d7678af3dcbb20b46349822607e0ad (diff) | |
| download | kernel_samsung_smdk4412-7c4bf08d3fa22613b628fc967953f581564a13ad.zip kernel_samsung_smdk4412-7c4bf08d3fa22613b628fc967953f581564a13ad.tar.gz kernel_samsung_smdk4412-7c4bf08d3fa22613b628fc967953f581564a13ad.tar.bz2 | |
proc connector: reject unprivileged listener bumps
commit e70ab977991964a5a7ad1182799451d067e62669 upstream.
While PROC_CN_MCAST_LISTEN/IGNORE is entirely advisory, it was possible
for an unprivileged user to turn off notifications for all listeners by
sending PROC_CN_MCAST_IGNORE. Instead, require the same privileges as
required for a multicast bind.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Matt Helsley <matthltc@us.ibm.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Acked-by: Matt Helsley <matthltc@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/connector')
| -rw-r--r-- | drivers/connector/cn_proc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 77e1e6c..46bbf43 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -303,6 +303,12 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, if (msg->len != sizeof(*mc_op)) return; + /* Can only change if privileged. */ + if (!capable(CAP_NET_ADMIN)) { + err = EPERM; + goto out; + } + mc_op = (enum proc_cn_mcast_op*)msg->data; switch (*mc_op) { case PROC_CN_MCAST_LISTEN: @@ -315,6 +321,8 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, err = EINVAL; break; } + +out: cn_proc_ack(err, msg->seq, msg->ack); } |