summaryrefslogtreecommitdiffstats
path: root/include/net/lapb.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-07-04 22:35:20 +0100
committerDavid S. Miller <davem@davemloft.net>2017-07-04 22:35:20 +0100
commitdcc13ee85f15325c1c28d6e8214f2884cca25b75 (patch)
treec9e439fb24a3171edd0421ee6f41cd9a974cc4ae /include/net/lapb.h
parentbf72acefebb459af3c805a386cd7e5456e3ad6ee (diff)
parentb6d52ede224836f74dff50666b6a3076a5b8c92d (diff)
downloadblackbird-obmc-linux-dcc13ee85f15325c1c28d6e8214f2884cca25b75.tar.gz
blackbird-obmc-linux-dcc13ee85f15325c1c28d6e8214f2884cca25b75.zip
Merge branch 'net-subsystem-misc-refcounter-conversions'
Elena Reshetova says: ==================== v2 net subsystem misc refcounter conversions Changes in v2: * rebase on top of net-next * currently by default refcount_t = atomic_t (*) and uses all atomic standard operations unless CONFIG_REFCOUNT_FULL is enabled. This is a compromise for the systems that are critical on performance (such as net) and cannot accept even slight delay on the refcounter operations. This series, for various misc network components, replaces atomic_t reference counters with the new refcount_t type and API (see include/linux/refcount.h). By doing this we prevent intentional or accidental underflows or overflows that can led to use-after-free vulnerabilities. These are the last networking-related conversions with the exception of network drivers (to be send separately). Please excuse the long patch set, but seems like breaking it up won't save that much on CC list and most of the changes are trivial. The patches are fully independent and can be cherry-picked separately. In order to try with refcount functionality enabled in run-time, CONFIG_REFCOUNT_FULL must be enabled. NOTE: automatic kernel builder for some reason doesn't like all my network branches and regularly times out the builds on these branches. Suggestion for "waiting a day for a good coverage" doesn't work, as we have seen with generic network conversions. So please wait for the full report from kernel test rebot before merging further up. This has been compile-tested in 116 configs, but 71 timed out (including all s390-related configs again). I am trying to see if they can fix build coverage for me in meanwhile. * The respective change is currently merged into -next as "locking/refcount: Create unchecked atomic_t implementation". ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/lapb.h')
-rw-r--r--include/net/lapb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/lapb.h b/include/net/lapb.h
index 9510f8725f03..85e773742f4e 100644
--- a/include/net/lapb.h
+++ b/include/net/lapb.h
@@ -1,6 +1,7 @@
#ifndef _LAPB_H
#define _LAPB_H
#include <linux/lapb.h>
+#include <linux/refcount.h>
#define LAPB_HEADER_LEN 20 /* LAPB over Ethernet + a bit more */
@@ -101,7 +102,7 @@ struct lapb_cb {
struct lapb_frame frmr_data;
unsigned char frmr_type;
- atomic_t refcnt;
+ refcount_t refcnt;
};
/* lapb_iface.c */
OpenPOWER on IntegriCloud