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 21:07:57 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 05:20:36 +07:00
|
|
|
/* net/atm/proc.c - ATM /proc interface
|
|
|
|
|
*
|
|
|
|
|
* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA
|
|
|
|
|
*
|
|
|
|
|
* seq_file api usage by romieu@fr.zoreil.com
|
|
|
|
|
*
|
|
|
|
|
* Evaluating the efficiency of the whole thing if left as an exercise to
|
|
|
|
|
* the reader.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/module.h> /* for EXPORT_SYMBOL */
|
|
|
|
|
#include <linux/string.h>
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
|
#include <linux/mm.h>
|
|
|
|
|
#include <linux/fs.h>
|
|
|
|
|
#include <linux/stat.h>
|
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
|
#include <linux/seq_file.h>
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
|
#include <linux/atm.h>
|
|
|
|
|
#include <linux/atmdev.h>
|
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
|
#include <linux/atmclip.h>
|
|
|
|
|
#include <linux/init.h> /* for __init */
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2007-09-12 17:01:34 +07:00
|
|
|
#include <net/net_namespace.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <net/atmclip.h>
|
2010-01-26 18:40:13 +07:00
|
|
|
#include <linux/uaccess.h>
|
|
|
|
|
#include <linux/param.h> /* for HZ */
|
2011-07-27 06:09:06 +07:00
|
|
|
#include <linux/atomic.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include "resources.h"
|
|
|
|
|
#include "common.h" /* atm_proc_init prototype */
|
|
|
|
|
#include "signaling.h" /* to get sigd - ugly too */
|
|
|
|
|
|
2010-01-26 18:40:13 +07:00
|
|
|
static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
|
|
|
|
|
size_t count, loff_t *pos);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2007-02-12 15:55:35 +07:00
|
|
|
static const struct file_operations proc_atm_dev_ops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.read = proc_dev_atm_read,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 23:52:59 +07:00
|
|
|
.llseek = noop_llseek,
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void add_stats(struct seq_file *seq, const char *aal,
|
|
|
|
|
const struct k_atm_aal_stats *stats)
|
|
|
|
|
{
|
|
|
|
|
seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
|
2010-01-26 18:40:13 +07:00
|
|
|
atomic_read(&stats->tx), atomic_read(&stats->tx_err),
|
|
|
|
|
atomic_read(&stats->rx), atomic_read(&stats->rx_err),
|
|
|
|
|
atomic_read(&stats->rx_drop));
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
seq_printf(seq, "%3d %-8s", dev->number, dev->type);
|
|
|
|
|
for (i = 0; i < ESI_LEN; i++)
|
|
|
|
|
seq_printf(seq, "%02x", dev->esi[i]);
|
|
|
|
|
seq_puts(seq, " ");
|
|
|
|
|
add_stats(seq, "0", &dev->stats.aal0);
|
|
|
|
|
seq_puts(seq, " ");
|
|
|
|
|
add_stats(seq, "5", &dev->stats.aal5);
|
2017-07-04 19:53:01 +07:00
|
|
|
seq_printf(seq, "\t[%d]", refcount_read(&dev->refcnt));
|
2005-04-17 05:20:36 +07:00
|
|
|
seq_putc(seq, '\n');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct vcc_state {
|
|
|
|
|
int bucket;
|
|
|
|
|
struct sock *sk;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static inline int compare_family(struct sock *sk, int family)
|
|
|
|
|
{
|
|
|
|
|
return !family || (sk->sk_family == family);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __vcc_walk(struct sock **sock, int family, int *bucket, loff_t l)
|
|
|
|
|
{
|
|
|
|
|
struct sock *sk = *sock;
|
|
|
|
|
|
2008-04-10 17:33:03 +07:00
|
|
|
if (sk == SEQ_START_TOKEN) {
|
2005-04-17 05:20:36 +07:00
|
|
|
for (*bucket = 0; *bucket < VCC_HTABLE_SIZE; ++*bucket) {
|
|
|
|
|
struct hlist_head *head = &vcc_hash[*bucket];
|
|
|
|
|
|
|
|
|
|
sk = hlist_empty(head) ? NULL : __sk_head(head);
|
|
|
|
|
if (sk)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
l--;
|
2007-02-09 21:24:29 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
try_again:
|
|
|
|
|
for (; sk; sk = sk_next(sk)) {
|
|
|
|
|
l -= compare_family(sk, family);
|
|
|
|
|
if (l < 0)
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
if (!sk && ++*bucket < VCC_HTABLE_SIZE) {
|
|
|
|
|
sk = sk_head(&vcc_hash[*bucket]);
|
|
|
|
|
goto try_again;
|
|
|
|
|
}
|
2008-04-10 17:33:03 +07:00
|
|
|
sk = SEQ_START_TOKEN;
|
2005-04-17 05:20:36 +07:00
|
|
|
out:
|
|
|
|
|
*sock = sk;
|
|
|
|
|
return (l < 0);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-18 11:09:21 +07:00
|
|
|
static inline void *vcc_walk(struct seq_file *seq, loff_t l)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2018-04-18 11:09:21 +07:00
|
|
|
struct vcc_state *state = seq->private;
|
|
|
|
|
int family = (uintptr_t)(PDE_DATA(file_inode(seq->file)));
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2018-04-18 11:09:21 +07:00
|
|
|
return __vcc_walk(&state->sk, family, &state->bucket, l) ?
|
|
|
|
|
state : NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
|
2008-01-15 18:29:50 +07:00
|
|
|
__acquires(vcc_sklist_lock)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
|
struct vcc_state *state = seq->private;
|
|
|
|
|
loff_t left = *pos;
|
|
|
|
|
|
|
|
|
|
read_lock(&vcc_sklist_lock);
|
2008-04-10 17:33:03 +07:00
|
|
|
state->sk = SEQ_START_TOKEN;
|
2018-04-18 11:09:21 +07:00
|
|
|
return left ? vcc_walk(seq, left) : SEQ_START_TOKEN;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void vcc_seq_stop(struct seq_file *seq, void *v)
|
2008-01-15 18:29:50 +07:00
|
|
|
__releases(vcc_sklist_lock)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
|
read_unlock(&vcc_sklist_lock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
|
|
{
|
2018-04-18 11:09:21 +07:00
|
|
|
v = vcc_walk(seq, 1);
|
2005-04-17 05:20:36 +07:00
|
|
|
*pos += !!PTR_ERR(v);
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
|
|
|
|
|
{
|
2010-01-26 18:40:13 +07:00
|
|
|
static const char *const class_name[] = {
|
|
|
|
|
"off", "UBR", "CBR", "VBR", "ABR"};
|
2009-08-06 00:42:58 +07:00
|
|
|
static const char *const aal_name[] = {
|
2005-04-17 05:20:36 +07:00
|
|
|
"---", "1", "2", "3/4", /* 0- 3 */
|
|
|
|
|
"???", "5", "???", "???", /* 4- 7 */
|
|
|
|
|
"???", "???", "???", "???", /* 8-11 */
|
|
|
|
|
"???", "0", "???", "???"}; /* 12-15 */
|
|
|
|
|
|
|
|
|
|
seq_printf(seq, "%3d %3d %5d %-3s %7d %-5s %7d %-6s",
|
2010-01-26 18:40:13 +07:00
|
|
|
vcc->dev->number, vcc->vpi, vcc->vci,
|
|
|
|
|
vcc->qos.aal >= ARRAY_SIZE(aal_name) ? "err" :
|
|
|
|
|
aal_name[vcc->qos.aal], vcc->qos.rxtp.min_pcr,
|
|
|
|
|
class_name[vcc->qos.rxtp.traffic_class],
|
|
|
|
|
vcc->qos.txtp.min_pcr,
|
|
|
|
|
class_name[vcc->qos.txtp.traffic_class]);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (test_bit(ATM_VF_IS_CLIP, &vcc->flags)) {
|
|
|
|
|
struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
|
|
|
|
|
struct net_device *dev;
|
|
|
|
|
|
|
|
|
|
dev = clip_vcc->entry ? clip_vcc->entry->neigh->dev : NULL;
|
|
|
|
|
seq_printf(seq, "CLIP, Itf:%s, Encap:",
|
|
|
|
|
dev ? dev->name : "none?");
|
|
|
|
|
seq_printf(seq, "%s", clip_vcc->encap ? "LLC/SNAP" : "None");
|
|
|
|
|
}
|
|
|
|
|
seq_putc(seq, '\n');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *vcc_state(struct atm_vcc *vcc)
|
|
|
|
|
{
|
2009-08-06 00:42:58 +07:00
|
|
|
static const char *const map[] = { ATM_VS2TXT_MAP };
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
return map[ATM_VF2VS(vcc->flags)];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
|
|
|
|
|
{
|
|
|
|
|
struct sock *sk = sk_atm(vcc);
|
|
|
|
|
|
net: convert %p usage to %pK
The %pK format specifier is designed to hide exposed kernel pointers,
specifically via /proc interfaces. Exposing these pointers provides an
easy target for kernel write vulnerabilities, since they reveal the
locations of writable structures containing easily triggerable function
pointers. The behavior of %pK depends on the kptr_restrict sysctl.
If kptr_restrict is set to 0, no deviation from the standard %p behavior
occurs. If kptr_restrict is set to 1, the default, if the current user
(intended to be a reader via seq_printf(), etc.) does not have CAP_SYSLOG
(currently in the LSM tree), kernel pointers using %pK are printed as 0's.
If kptr_restrict is set to 2, kernel pointers using %pK are printed as
0's regardless of privileges. Replacing with 0's was chosen over the
default "(null)", which cannot be parsed by userland %p, which expects
"(nil)".
The supporting code for kptr_restrict and %pK are currently in the -mm
tree. This patch converts users of %p in net/ to %pK. Cases of printing
pointers to the syslog are not covered, since this would eliminate useful
information for postmortem debugging and the reading of the syslog is
already optionally protected by the dmesg_restrict sysctl.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Thomas Graf <tgraf@infradead.org>
Cc: Eugene Teo <eugeneteo@kernel.org>
Cc: Kees Cook <kees.cook@canonical.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Eric Paris <eparis@parisplace.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-23 19:17:35 +07:00
|
|
|
seq_printf(seq, "%pK ", vcc);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!vcc->dev)
|
|
|
|
|
seq_printf(seq, "Unassigned ");
|
2007-02-09 21:24:29 +07:00
|
|
|
else
|
2005-04-17 05:20:36 +07:00
|
|
|
seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi,
|
|
|
|
|
vcc->vci);
|
|
|
|
|
switch (sk->sk_family) {
|
2010-01-26 18:40:13 +07:00
|
|
|
case AF_ATMPVC:
|
|
|
|
|
seq_printf(seq, "PVC");
|
|
|
|
|
break;
|
|
|
|
|
case AF_ATMSVC:
|
|
|
|
|
seq_printf(seq, "SVC");
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
seq_printf(seq, "%3d", sk->sk_family);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2010-01-26 18:40:13 +07:00
|
|
|
seq_printf(seq, " %04lx %5d %7d/%7d %7d/%7d [%d]\n",
|
|
|
|
|
vcc->flags, sk->sk_err,
|
|
|
|
|
sk_wmem_alloc_get(sk), sk->sk_sndbuf,
|
|
|
|
|
sk_rmem_alloc_get(sk), sk->sk_rcvbuf,
|
2017-06-30 17:08:01 +07:00
|
|
|
refcount_read(&sk->sk_refcnt));
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)
|
|
|
|
|
{
|
|
|
|
|
if (!vcc->dev)
|
|
|
|
|
seq_printf(seq, sizeof(void *) == 4 ?
|
net: convert %p usage to %pK
The %pK format specifier is designed to hide exposed kernel pointers,
specifically via /proc interfaces. Exposing these pointers provides an
easy target for kernel write vulnerabilities, since they reveal the
locations of writable structures containing easily triggerable function
pointers. The behavior of %pK depends on the kptr_restrict sysctl.
If kptr_restrict is set to 0, no deviation from the standard %p behavior
occurs. If kptr_restrict is set to 1, the default, if the current user
(intended to be a reader via seq_printf(), etc.) does not have CAP_SYSLOG
(currently in the LSM tree), kernel pointers using %pK are printed as 0's.
If kptr_restrict is set to 2, kernel pointers using %pK are printed as
0's regardless of privileges. Replacing with 0's was chosen over the
default "(null)", which cannot be parsed by userland %p, which expects
"(nil)".
The supporting code for kptr_restrict and %pK are currently in the -mm
tree. This patch converts users of %p in net/ to %pK. Cases of printing
pointers to the syslog are not covered, since this would eliminate useful
information for postmortem debugging and the reading of the syslog is
already optionally protected by the dmesg_restrict sysctl.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Thomas Graf <tgraf@infradead.org>
Cc: Eugene Teo <eugeneteo@kernel.org>
Cc: Kees Cook <kees.cook@canonical.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Eric Paris <eparis@parisplace.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-23 19:17:35 +07:00
|
|
|
"N/A@%pK%10s" : "N/A@%pK%2s", vcc, "");
|
2005-04-17 05:20:36 +07:00
|
|
|
else
|
|
|
|
|
seq_printf(seq, "%3d %3d %5d ",
|
|
|
|
|
vcc->dev->number, vcc->vpi, vcc->vci);
|
|
|
|
|
seq_printf(seq, "%-10s ", vcc_state(vcc));
|
|
|
|
|
seq_printf(seq, "%s%s", vcc->remote.sas_addr.pub,
|
|
|
|
|
*vcc->remote.sas_addr.pub && *vcc->remote.sas_addr.prv ? "+" : "");
|
|
|
|
|
if (*vcc->remote.sas_addr.prv) {
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ATM_ESA_LEN; i++)
|
|
|
|
|
seq_printf(seq, "%02x", vcc->remote.sas_addr.prv[i]);
|
|
|
|
|
}
|
|
|
|
|
seq_putc(seq, '\n');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int atm_dev_seq_show(struct seq_file *seq, void *v)
|
|
|
|
|
{
|
|
|
|
|
static char atm_dev_banner[] =
|
|
|
|
|
"Itf Type ESI/\"MAC\"addr "
|
|
|
|
|
"AAL(TX,err,RX,err,drop) ... [refcnt]\n";
|
2007-02-09 21:24:29 +07:00
|
|
|
|
2010-02-09 06:21:51 +07:00
|
|
|
if (v == &atm_devs)
|
2005-04-17 05:20:36 +07:00
|
|
|
seq_puts(seq, atm_dev_banner);
|
|
|
|
|
else {
|
|
|
|
|
struct atm_dev *dev = list_entry(v, struct atm_dev, dev_list);
|
|
|
|
|
|
|
|
|
|
atm_dev_info(seq, dev);
|
|
|
|
|
}
|
2007-02-09 21:24:29 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2007-02-09 21:24:29 +07:00
|
|
|
|
2007-07-11 13:07:31 +07:00
|
|
|
static const struct seq_operations atm_dev_seq_ops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.start = atm_dev_seq_start,
|
|
|
|
|
.next = atm_dev_seq_next,
|
|
|
|
|
.stop = atm_dev_seq_stop,
|
|
|
|
|
.show = atm_dev_seq_show,
|
|
|
|
|
};
|
2007-02-09 21:24:29 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int pvc_seq_show(struct seq_file *seq, void *v)
|
|
|
|
|
{
|
2007-02-09 21:24:29 +07:00
|
|
|
static char atm_pvc_banner[] =
|
2005-04-17 05:20:36 +07:00
|
|
|
"Itf VPI VCI AAL RX(PCR,Class) TX(PCR,Class)\n";
|
|
|
|
|
|
2008-04-10 17:33:03 +07:00
|
|
|
if (v == SEQ_START_TOKEN)
|
2005-04-17 05:20:36 +07:00
|
|
|
seq_puts(seq, atm_pvc_banner);
|
|
|
|
|
else {
|
|
|
|
|
struct vcc_state *state = seq->private;
|
|
|
|
|
struct atm_vcc *vcc = atm_sk(state->sk);
|
|
|
|
|
|
|
|
|
|
pvc_info(seq, vcc);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-11 13:07:31 +07:00
|
|
|
static const struct seq_operations pvc_seq_ops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.start = vcc_seq_start,
|
|
|
|
|
.next = vcc_seq_next,
|
|
|
|
|
.stop = vcc_seq_stop,
|
|
|
|
|
.show = pvc_seq_show,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int vcc_seq_show(struct seq_file *seq, void *v)
|
|
|
|
|
{
|
2008-04-10 17:33:03 +07:00
|
|
|
if (v == SEQ_START_TOKEN) {
|
2007-02-09 21:24:29 +07:00
|
|
|
seq_printf(seq, sizeof(void *) == 4 ? "%-8s%s" : "%-16s%s",
|
|
|
|
|
"Address ", "Itf VPI VCI Fam Flags Reply "
|
|
|
|
|
"Send buffer Recv buffer [refcnt]\n");
|
|
|
|
|
} else {
|
|
|
|
|
struct vcc_state *state = seq->private;
|
|
|
|
|
struct atm_vcc *vcc = atm_sk(state->sk);
|
|
|
|
|
|
|
|
|
|
vcc_info(seq, vcc);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2007-02-09 21:24:29 +07:00
|
|
|
|
2007-07-11 13:07:31 +07:00
|
|
|
static const struct seq_operations vcc_seq_ops = {
|
2007-02-09 21:24:29 +07:00
|
|
|
.start = vcc_seq_start,
|
|
|
|
|
.next = vcc_seq_next,
|
|
|
|
|
.stop = vcc_seq_stop,
|
|
|
|
|
.show = vcc_seq_show,
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
2007-02-09 21:24:29 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int svc_seq_show(struct seq_file *seq, void *v)
|
|
|
|
|
{
|
2009-08-06 00:42:58 +07:00
|
|
|
static const char atm_svc_banner[] =
|
2005-04-17 05:20:36 +07:00
|
|
|
"Itf VPI VCI State Remote\n";
|
|
|
|
|
|
2008-04-10 17:33:03 +07:00
|
|
|
if (v == SEQ_START_TOKEN)
|
2005-04-17 05:20:36 +07:00
|
|
|
seq_puts(seq, atm_svc_banner);
|
|
|
|
|
else {
|
|
|
|
|
struct vcc_state *state = seq->private;
|
|
|
|
|
struct atm_vcc *vcc = atm_sk(state->sk);
|
|
|
|
|
|
|
|
|
|
svc_info(seq, vcc);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-11 13:07:31 +07:00
|
|
|
static const struct seq_operations svc_seq_ops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.start = vcc_seq_start,
|
|
|
|
|
.next = vcc_seq_next,
|
|
|
|
|
.stop = vcc_seq_stop,
|
|
|
|
|
.show = svc_seq_show,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
|
|
|
|
|
size_t count, loff_t *pos)
|
|
|
|
|
{
|
|
|
|
|
struct atm_dev *dev;
|
|
|
|
|
unsigned long page;
|
|
|
|
|
int length;
|
|
|
|
|
|
2010-01-26 18:40:13 +07:00
|
|
|
if (count == 0)
|
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
page = get_zeroed_page(GFP_KERNEL);
|
2010-01-26 18:40:13 +07:00
|
|
|
if (!page)
|
|
|
|
|
return -ENOMEM;
|
2013-04-01 05:16:14 +07:00
|
|
|
dev = PDE_DATA(file_inode(file));
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!dev->ops->proc_read)
|
|
|
|
|
length = -EINVAL;
|
|
|
|
|
else {
|
2010-01-26 18:40:13 +07:00
|
|
|
length = dev->ops->proc_read(dev, pos, (char *)page);
|
|
|
|
|
if (length > count)
|
|
|
|
|
length = -EINVAL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
if (length >= 0) {
|
2010-01-26 18:40:13 +07:00
|
|
|
if (copy_to_user(buf, (char *)page, length))
|
|
|
|
|
length = -EFAULT;
|
2005-04-17 05:20:36 +07:00
|
|
|
(*pos)++;
|
|
|
|
|
}
|
|
|
|
|
free_page(page);
|
|
|
|
|
return length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct proc_dir_entry *atm_proc_root;
|
|
|
|
|
EXPORT_SYMBOL(atm_proc_root);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int atm_proc_dev_register(struct atm_dev *dev)
|
|
|
|
|
{
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
/* No proc info */
|
|
|
|
|
if (!dev->ops->proc_read)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
error = -ENOMEM;
|
2010-03-18 20:48:26 +07:00
|
|
|
dev->proc_name = kasprintf(GFP_KERNEL, "%s:%d", dev->type, dev->number);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!dev->proc_name)
|
|
|
|
|
goto err_out;
|
|
|
|
|
|
2008-05-02 18:08:30 +07:00
|
|
|
dev->proc_entry = proc_create_data(dev->proc_name, 0, atm_proc_root,
|
|
|
|
|
&proc_atm_dev_ops, dev);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!dev->proc_entry)
|
|
|
|
|
goto err_free_name;
|
|
|
|
|
return 0;
|
2010-01-26 18:40:13 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
err_free_name:
|
|
|
|
|
kfree(dev->proc_name);
|
|
|
|
|
err_out:
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void atm_proc_dev_deregister(struct atm_dev *dev)
|
|
|
|
|
{
|
|
|
|
|
if (!dev->ops->proc_read)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
remove_proc_entry(dev->proc_name, atm_proc_root);
|
|
|
|
|
kfree(dev->proc_name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int __init atm_proc_init(void)
|
|
|
|
|
{
|
2008-01-10 18:51:41 +07:00
|
|
|
atm_proc_root = proc_net_mkdir(&init_net, "atm", init_net.proc_net);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!atm_proc_root)
|
2018-04-15 15:53:36 +07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
proc_create_seq("devices", 0444, atm_proc_root, &atm_dev_seq_ops);
|
2018-04-18 11:09:21 +07:00
|
|
|
proc_create_seq_private("pvc", 0444, atm_proc_root, &pvc_seq_ops,
|
|
|
|
|
sizeof(struct vcc_state), (void *)(uintptr_t)PF_ATMPVC);
|
|
|
|
|
proc_create_seq_private("svc", 0444, atm_proc_root, &svc_seq_ops,
|
|
|
|
|
sizeof(struct vcc_state), (void *)(uintptr_t)PF_ATMSVC);
|
|
|
|
|
proc_create_seq_private("vc", 0444, atm_proc_root, &vcc_seq_ops,
|
|
|
|
|
sizeof(struct vcc_state), NULL);
|
2018-04-15 15:53:36 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
2006-08-15 16:02:33 +07:00
|
|
|
void atm_proc_exit(void)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2018-04-15 15:53:36 +07:00
|
|
|
remove_proc_subtree("atm", init_net.proc_net);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|