License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 06:20:36 +08:00
|
|
|
/* ATM ioctl handling */
|
|
|
|
|
|
|
|
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
/* 2003 John Levon <levon@movementarian.org> */
|
|
|
|
|
2010-01-26 19:40:00 +08:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/kmod.h>
|
|
|
|
#include <linux/net.h> /* struct socket, struct proto_ops */
|
|
|
|
#include <linux/atm.h> /* ATM stuff */
|
|
|
|
#include <linux/atmdev.h>
|
|
|
|
#include <linux/atmclip.h> /* CLIP_*ENCAP */
|
|
|
|
#include <linux/atmarp.h> /* manifest constants */
|
2006-01-12 04:17:47 +08:00
|
|
|
#include <linux/capability.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/sonet.h> /* for ioctls */
|
|
|
|
#include <linux/atmsvc.h>
|
|
|
|
#include <linux/atmmpc.h>
|
|
|
|
#include <net/atmclip.h>
|
|
|
|
#include <linux/atmlec.h>
|
2006-03-21 14:33:17 +08:00
|
|
|
#include <linux/mutex.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/ioctls.h>
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
#include <net/compat.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include "resources.h"
|
|
|
|
#include "signaling.h" /* for WAITING and sigd_attach */
|
2005-09-06 09:04:28 +08:00
|
|
|
#include "common.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
2006-03-21 14:33:17 +08:00
|
|
|
static DEFINE_MUTEX(ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
static LIST_HEAD(ioctl_list);
|
|
|
|
|
|
|
|
|
|
|
|
void register_atm_ioctl(struct atm_ioctl *ioctl)
|
|
|
|
{
|
2006-03-21 14:33:17 +08:00
|
|
|
mutex_lock(&ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
list_add_tail(&ioctl->list, &ioctl_list);
|
2006-03-21 14:33:17 +08:00
|
|
|
mutex_unlock(&ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2010-01-26 19:40:07 +08:00
|
|
|
EXPORT_SYMBOL(register_atm_ioctl);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
void deregister_atm_ioctl(struct atm_ioctl *ioctl)
|
|
|
|
{
|
2006-03-21 14:33:17 +08:00
|
|
|
mutex_lock(&ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
list_del(&ioctl->list);
|
2006-03-21 14:33:17 +08:00
|
|
|
mutex_unlock(&ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(deregister_atm_ioctl);
|
|
|
|
|
2010-01-26 19:40:07 +08:00
|
|
|
static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,
|
|
|
|
unsigned long arg, int compat)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct atm_vcc *vcc;
|
|
|
|
int error;
|
2010-01-26 19:40:07 +08:00
|
|
|
struct list_head *pos;
|
2005-04-17 06:20:36 +08:00
|
|
|
void __user *argp = (void __user *)arg;
|
|
|
|
|
|
|
|
vcc = ATM_SD(sock);
|
|
|
|
switch (cmd) {
|
2010-01-26 19:40:07 +08:00
|
|
|
case SIOCOUTQ:
|
|
|
|
if (sock->state != SS_CONNECTED ||
|
|
|
|
!test_bit(ATM_VF_READY, &vcc->flags)) {
|
|
|
|
error = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk),
|
|
|
|
(int __user *)argp) ? -EFAULT : 0;
|
|
|
|
goto done;
|
|
|
|
case SIOCINQ:
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
if (sock->state != SS_CONNECTED) {
|
|
|
|
error = -EINVAL;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto done;
|
2010-01-26 19:40:07 +08:00
|
|
|
}
|
|
|
|
skb = skb_peek(&sk->sk_receive_queue);
|
|
|
|
error = put_user(skb ? skb->len : 0,
|
|
|
|
(int __user *)argp) ? -EFAULT : 0;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
case ATM_SETSC:
|
2012-05-14 05:56:26 +08:00
|
|
|
net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n",
|
|
|
|
current->comm, task_pid_nr(current));
|
2010-01-26 19:40:07 +08:00
|
|
|
error = 0;
|
|
|
|
goto done;
|
|
|
|
case ATMSIGD_CTRL:
|
|
|
|
if (!capable(CAP_NET_ADMIN)) {
|
|
|
|
error = -EPERM;
|
2007-03-19 08:33:16 +08:00
|
|
|
goto done;
|
2010-01-26 19:40:07 +08:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* The user/kernel protocol for exchanging signalling
|
|
|
|
* info uses kernel pointers as opaque references,
|
|
|
|
* so the holder of the file descriptor can scribble
|
|
|
|
* on the kernel... so we should make sure that we
|
|
|
|
* have the same privileges that /proc/kcore needs
|
|
|
|
*/
|
|
|
|
if (!capable(CAP_SYS_RAWIO)) {
|
|
|
|
error = -EPERM;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto done;
|
2010-01-26 19:40:07 +08:00
|
|
|
}
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
#ifdef CONFIG_COMPAT
|
2010-01-26 19:40:07 +08:00
|
|
|
/* WTF? I don't even want to _think_ about making this
|
|
|
|
work for 32-bit userspace. TBH I don't really want
|
|
|
|
to think about it at all. dwmw2. */
|
|
|
|
if (compat) {
|
2012-05-14 05:56:26 +08:00
|
|
|
net_warn_ratelimited("32-bit task cannot be atmsigd\n");
|
2010-01-26 19:40:07 +08:00
|
|
|
error = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
#endif
|
2010-01-26 19:40:07 +08:00
|
|
|
error = sigd_attach(vcc);
|
|
|
|
if (!error)
|
|
|
|
sock->state = SS_CONNECTED;
|
|
|
|
goto done;
|
|
|
|
case ATM_SETBACKEND:
|
|
|
|
case ATM_NEWBACKENDIF:
|
|
|
|
{
|
|
|
|
atm_backend_t backend;
|
|
|
|
error = get_user(backend, (atm_backend_t __user *)argp);
|
|
|
|
if (error)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto done;
|
2010-01-26 19:40:07 +08:00
|
|
|
switch (backend) {
|
|
|
|
case ATM_BACKEND_PPP:
|
|
|
|
request_module("pppoatm");
|
2005-09-29 07:34:24 +08:00
|
|
|
break;
|
2010-01-26 19:40:07 +08:00
|
|
|
case ATM_BACKEND_BR2684:
|
|
|
|
request_module("br2684");
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2010-01-26 19:40:07 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case ATMMPC_CTRL:
|
|
|
|
case ATMMPC_DATA:
|
|
|
|
request_module("mpoa");
|
|
|
|
break;
|
|
|
|
case ATMARPD_CTRL:
|
|
|
|
request_module("clip");
|
|
|
|
break;
|
|
|
|
case ATMLEC_CTRL:
|
|
|
|
request_module("lec");
|
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
error = -ENOIOCTLCMD;
|
|
|
|
|
2006-03-21 14:33:17 +08:00
|
|
|
mutex_lock(&ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
list_for_each(pos, &ioctl_list) {
|
2010-01-26 19:40:07 +08:00
|
|
|
struct atm_ioctl *ic = list_entry(pos, struct atm_ioctl, list);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (try_module_get(ic->owner)) {
|
|
|
|
error = ic->ioctl(sock, cmd, arg);
|
|
|
|
module_put(ic->owner);
|
|
|
|
if (error != -ENOIOCTLCMD)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-03-21 14:33:17 +08:00
|
|
|
mutex_unlock(&ioctl_mutex);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (error != -ENOIOCTLCMD)
|
|
|
|
goto done;
|
|
|
|
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
error = atm_dev_ioctl(cmd, argp, compat);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
done:
|
|
|
|
return error;
|
|
|
|
}
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
|
|
|
|
int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|
|
|
{
|
|
|
|
return do_vcc_ioctl(sock, cmd, arg, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_COMPAT
|
2009-11-11 11:45:22 +08:00
|
|
|
/*
|
|
|
|
* FIXME:
|
|
|
|
* The compat_ioctl handling is duplicated, using both these conversion
|
|
|
|
* routines and the compat argument to the actual handlers. Both
|
|
|
|
* versions are somewhat incomplete and should be merged, e.g. by
|
|
|
|
* moving the ioctl number translation into the actual handlers and
|
|
|
|
* killing the conversion code.
|
|
|
|
*
|
|
|
|
* -arnd, November 2009
|
|
|
|
*/
|
|
|
|
#define ATM_GETLINKRATE32 _IOW('a', ATMIOC_ITF+1, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETNAMES32 _IOW('a', ATMIOC_ITF+3, struct compat_atm_iobuf)
|
|
|
|
#define ATM_GETTYPE32 _IOW('a', ATMIOC_ITF+4, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETESI32 _IOW('a', ATMIOC_ITF+5, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETADDR32 _IOW('a', ATMIOC_ITF+6, struct compat_atmif_sioc)
|
|
|
|
#define ATM_RSTADDR32 _IOW('a', ATMIOC_ITF+7, struct compat_atmif_sioc)
|
|
|
|
#define ATM_ADDADDR32 _IOW('a', ATMIOC_ITF+8, struct compat_atmif_sioc)
|
|
|
|
#define ATM_DELADDR32 _IOW('a', ATMIOC_ITF+9, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETCIRANGE32 _IOW('a', ATMIOC_ITF+10, struct compat_atmif_sioc)
|
|
|
|
#define ATM_SETCIRANGE32 _IOW('a', ATMIOC_ITF+11, struct compat_atmif_sioc)
|
|
|
|
#define ATM_SETESI32 _IOW('a', ATMIOC_ITF+12, struct compat_atmif_sioc)
|
|
|
|
#define ATM_SETESIF32 _IOW('a', ATMIOC_ITF+13, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETSTAT32 _IOW('a', ATMIOC_SARCOM+0, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETSTATZ32 _IOW('a', ATMIOC_SARCOM+1, struct compat_atmif_sioc)
|
|
|
|
#define ATM_GETLOOP32 _IOW('a', ATMIOC_SARCOM+2, struct compat_atmif_sioc)
|
|
|
|
#define ATM_SETLOOP32 _IOW('a', ATMIOC_SARCOM+3, struct compat_atmif_sioc)
|
|
|
|
#define ATM_QUERYLOOP32 _IOW('a', ATMIOC_SARCOM+4, struct compat_atmif_sioc)
|
|
|
|
|
|
|
|
static struct {
|
|
|
|
unsigned int cmd32;
|
|
|
|
unsigned int cmd;
|
|
|
|
} atm_ioctl_map[] = {
|
|
|
|
{ ATM_GETLINKRATE32, ATM_GETLINKRATE },
|
|
|
|
{ ATM_GETNAMES32, ATM_GETNAMES },
|
|
|
|
{ ATM_GETTYPE32, ATM_GETTYPE },
|
|
|
|
{ ATM_GETESI32, ATM_GETESI },
|
|
|
|
{ ATM_GETADDR32, ATM_GETADDR },
|
|
|
|
{ ATM_RSTADDR32, ATM_RSTADDR },
|
|
|
|
{ ATM_ADDADDR32, ATM_ADDADDR },
|
|
|
|
{ ATM_DELADDR32, ATM_DELADDR },
|
|
|
|
{ ATM_GETCIRANGE32, ATM_GETCIRANGE },
|
|
|
|
{ ATM_SETCIRANGE32, ATM_SETCIRANGE },
|
|
|
|
{ ATM_SETESI32, ATM_SETESI },
|
|
|
|
{ ATM_SETESIF32, ATM_SETESIF },
|
|
|
|
{ ATM_GETSTAT32, ATM_GETSTAT },
|
|
|
|
{ ATM_GETSTATZ32, ATM_GETSTATZ },
|
|
|
|
{ ATM_GETLOOP32, ATM_GETLOOP },
|
|
|
|
{ ATM_SETLOOP32, ATM_SETLOOP },
|
|
|
|
{ ATM_QUERYLOOP32, ATM_QUERYLOOP },
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NR_ATM_IOCTL ARRAY_SIZE(atm_ioctl_map)
|
|
|
|
|
|
|
|
static int do_atm_iobuf(struct socket *sock, unsigned int cmd,
|
|
|
|
unsigned long arg)
|
|
|
|
{
|
|
|
|
struct atm_iobuf __user *iobuf;
|
|
|
|
struct compat_atm_iobuf __user *iobuf32;
|
|
|
|
u32 data;
|
|
|
|
void __user *datap;
|
|
|
|
int len, err;
|
|
|
|
|
|
|
|
iobuf = compat_alloc_user_space(sizeof(*iobuf));
|
|
|
|
iobuf32 = compat_ptr(arg);
|
|
|
|
|
|
|
|
if (get_user(len, &iobuf32->length) ||
|
|
|
|
get_user(data, &iobuf32->buffer))
|
|
|
|
return -EFAULT;
|
|
|
|
datap = compat_ptr(data);
|
|
|
|
if (put_user(len, &iobuf->length) ||
|
|
|
|
put_user(datap, &iobuf->buffer))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
err = do_vcc_ioctl(sock, cmd, (unsigned long) iobuf, 0);
|
|
|
|
|
|
|
|
if (!err) {
|
|
|
|
if (copy_in_user(&iobuf32->length, &iobuf->length,
|
|
|
|
sizeof(int)))
|
|
|
|
err = -EFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_atmif_sioc(struct socket *sock, unsigned int cmd,
|
|
|
|
unsigned long arg)
|
|
|
|
{
|
|
|
|
struct atmif_sioc __user *sioc;
|
|
|
|
struct compat_atmif_sioc __user *sioc32;
|
|
|
|
u32 data;
|
|
|
|
void __user *datap;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
sioc = compat_alloc_user_space(sizeof(*sioc));
|
|
|
|
sioc32 = compat_ptr(arg);
|
|
|
|
|
2010-01-26 19:40:07 +08:00
|
|
|
if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int)) ||
|
|
|
|
get_user(data, &sioc32->arg))
|
2009-11-11 11:45:22 +08:00
|
|
|
return -EFAULT;
|
|
|
|
datap = compat_ptr(data);
|
|
|
|
if (put_user(datap, &sioc->arg))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
err = do_vcc_ioctl(sock, cmd, (unsigned long) sioc, 0);
|
|
|
|
|
|
|
|
if (!err) {
|
|
|
|
if (copy_in_user(&sioc32->length, &sioc->length,
|
|
|
|
sizeof(int)))
|
|
|
|
err = -EFAULT;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_atm_ioctl(struct socket *sock, unsigned int cmd32,
|
|
|
|
unsigned long arg)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
unsigned int cmd = 0;
|
|
|
|
|
|
|
|
switch (cmd32) {
|
|
|
|
case SONET_GETSTAT:
|
|
|
|
case SONET_GETSTATZ:
|
|
|
|
case SONET_GETDIAG:
|
|
|
|
case SONET_SETDIAG:
|
|
|
|
case SONET_CLRDIAG:
|
|
|
|
case SONET_SETFRAMING:
|
|
|
|
case SONET_GETFRAMING:
|
|
|
|
case SONET_GETFRSENSE:
|
|
|
|
return do_atmif_sioc(sock, cmd32, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < NR_ATM_IOCTL; i++) {
|
|
|
|
if (cmd32 == atm_ioctl_map[i].cmd32) {
|
|
|
|
cmd = atm_ioctl_map[i].cmd;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i == NR_ATM_IOCTL)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case ATM_GETNAMES:
|
|
|
|
return do_atm_iobuf(sock, cmd, arg);
|
|
|
|
|
|
|
|
case ATM_GETLINKRATE:
|
|
|
|
case ATM_GETTYPE:
|
|
|
|
case ATM_GETESI:
|
|
|
|
case ATM_GETADDR:
|
|
|
|
case ATM_RSTADDR:
|
|
|
|
case ATM_ADDADDR:
|
|
|
|
case ATM_DELADDR:
|
|
|
|
case ATM_GETCIRANGE:
|
|
|
|
case ATM_SETCIRANGE:
|
|
|
|
case ATM_SETESI:
|
|
|
|
case ATM_SETESIF:
|
|
|
|
case ATM_GETSTAT:
|
|
|
|
case ATM_GETSTATZ:
|
|
|
|
case ATM_GETLOOP:
|
|
|
|
case ATM_SETLOOP:
|
|
|
|
case ATM_QUERYLOOP:
|
|
|
|
return do_atmif_sioc(sock, cmd, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int vcc_compat_ioctl(struct socket *sock, unsigned int cmd,
|
|
|
|
unsigned long arg)
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
{
|
2009-11-11 11:45:22 +08:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = do_vcc_ioctl(sock, cmd, arg, 1);
|
|
|
|
if (ret != -ENOIOCTLCMD)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return do_atm_ioctl(sock, cmd, arg);
|
atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-04 14:12:38 +08:00
|
|
|
}
|
|
|
|
#endif
|