| Message ID | 1508451889.30291.4.camel@edumazet-glaptop3.roam.corp.google.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v3,net] dccp/tcp: fix ireq->opt races | expand |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 19 Oct 2017 15:24:49 -0700 > From: Eric Dumazet <edumazet@google.com> > > syzkaller found another bug in DCCP/TCP stacks [1] > > For the reasons explained in commit ce1050089c96 ("tcp/dccp: fix > ireq->pktopts race"), we need to make sure we do not access > ireq->opt unless we own the request sock. ... > Fixes: e994b2f0fb92 ("tcp: do not lock listener to process SYN packets") > Fixes: 079096f103fa ("tcp/dccp: install syn_recv requests into ehash table") > Signed-off-by: Eric Dumazet <edumazet@google.com> > --- > v3: fixed the whit space mangling > v2: removed some lines from KASAN report that confuse patchwork. Much better, applied and queued up for -stable.
From: David Miller <davem@davemloft.net> Date: Fri, 20 Oct 2017 07:04:58 +0100 (WEST) > Much better, applied and queued up for -stable. I take that back. Please build test your changes more thoroughly. In file included from ./arch/x86/include/asm/atomic.h:7:0, from ./include/linux/atomic.h:4, from ./include/linux/rcupdate.h:38, from net/ipv4/cipso_ipv4.c:40: net/ipv4/cipso_ipv4.c: In function ‘cipso_v4_req_setattr’: net/ipv4/cipso_ipv4.c:1954:22: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = xchg(&req_inet->opt, opt); ^ ./arch/x86/include/asm/cmpxchg.h:43:24: note: in definition of macro ‘__xchg_op’ __typeof__ (*(ptr)) __ret = (arg); \ ^~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ ./arch/x86/include/asm/cmpxchg.h:43:38: warning: initialization makes integer from pointer without a cast [-Wint-conversion] __typeof__ (*(ptr)) __ret = (arg); \ ^ ./arch/x86/include/asm/cmpxchg.h:77:22: note: in expansion of macro ‘__xchg_op’ #define xchg(ptr, v) __xchg_op((ptr), (v), xchg, "") ^~~~~~~~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ net/ipv4/cipso_ipv4.c:1954:22: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = xchg(&req_inet->opt, opt); ^ ./arch/x86/include/asm/cmpxchg.h:44:20: note: in definition of macro ‘__xchg_op’ switch (sizeof(*(ptr))) { \ ^~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ net/ipv4/cipso_ipv4.c:1954:22: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = xchg(&req_inet->opt, opt); ^ ./arch/x86/include/asm/cmpxchg.h:47:35: note: in definition of macro ‘__xchg_op’ : "+q" (__ret), "+m" (*(ptr)) \ ^~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ net/ipv4/cipso_ipv4.c:1954:22: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = xchg(&req_inet->opt, opt); ^ ./arch/x86/include/asm/cmpxchg.h:52:35: note: in definition of macro ‘__xchg_op’ : "+r" (__ret), "+m" (*(ptr)) \ ^~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ net/ipv4/cipso_ipv4.c:1954:22: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = xchg(&req_inet->opt, opt); ^ ./arch/x86/include/asm/cmpxchg.h:57:35: note: in definition of macro ‘__xchg_op’ : "+r" (__ret), "+m" (*(ptr)) \ ^~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ net/ipv4/cipso_ipv4.c:1954:22: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = xchg(&req_inet->opt, opt); ^ ./arch/x86/include/asm/cmpxchg.h:62:35: note: in definition of macro ‘__xchg_op’ : "+r" (__ret), "+m" (*(ptr)) \ ^~~ net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro ‘xchg’ opt = xchg(&req_inet->opt, opt); ^~~~ net/ipv4/cipso_ipv4.c:1954:6: warning: assignment makes pointer from integer without a cast [-Wint-conversion] opt = xchg(&req_inet->opt, opt); ^ net/ipv4/cipso_ipv4.c: In function ‘cipso_v4_req_delattr’: net/ipv4/cipso_ipv4.c:2073:16: error: ‘struct inet_request_sock’ has no member named ‘opt’ opt = req_inet->opt; ^~ net/ipv4/cipso_ipv4.c:2077:27: error: ‘struct inet_request_sock’ has no member named ‘opt’ cipso_v4_delopt(&req_inet->opt); ^~ scripts/Makefile.build:313: recipe for target 'net/ipv4/cipso_ipv4.o' failed make[2]: *** [net/ipv4/cipso_ipv4.o] Error 1 make[2]: *** Waiting for unfinished jobs.... scripts/Makefile.build:572: recipe for target 'net/ipv4' failed make[1]: *** [net/ipv4] Error 2 Makefile:1019: recipe for target 'net' failed make: *** [net] Error 2
On Fri, 2017-10-20 at 07:18 +0100, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Fri, 20 Oct 2017 07:04:58 +0100 (WEST) > > > Much better, applied and queued up for -stable. > > I take that back. > > Please build test your changes more thoroughly. Arg, sorry for wasting your time, I will send a v4.
Hi Eric,
[auto build test WARNING on net/master]
url: https://github.com/0day-ci/linux/commits/Eric-Dumazet/dccp-tcp-fix-ireq-opt-races/20171021-034024
config: alpha-allmodconfig (attached as .config)
compiler: alpha-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=alpha
All warnings (new ones prefixed by >>):
In file included from arch/alpha/include/asm/atomic.h:6:0,
from include/linux/atomic.h:4,
from include/linux/rcupdate.h:38,
from net/ipv4/cipso_ipv4.c:40:
net/ipv4/cipso_ipv4.c: In function 'cipso_v4_req_setattr':
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:47:15: note: in definition of macro 'xchg'
__typeof__(*(ptr)) _x_ = (x); \
^~~
>> arch/alpha/include/asm/cmpxchg.h:47:27: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
__typeof__(*(ptr)) _x_ = (x); \
^
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:48:16: note: in definition of macro 'xchg'
(__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, \
^~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:48:31: note: in definition of macro 'xchg'
(__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, \
^~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:49:15: note: in definition of macro 'xchg'
sizeof(*(ptr))); \
^~~
net/ipv4/cipso_ipv4.c: In function 'cipso_v4_req_delattr':
net/ipv4/cipso_ipv4.c:2073:16: error: 'struct inet_request_sock' has no member named 'opt'
opt = req_inet->opt;
^~
net/ipv4/cipso_ipv4.c:2077:27: error: 'struct inet_request_sock' has no member named 'opt'
cipso_v4_delopt(&req_inet->opt);
^~
--
In file included from arch/alpha/include/asm/atomic.h:6:0,
from include/linux/atomic.h:4,
from include/linux/rcupdate.h:38,
from net//ipv4/cipso_ipv4.c:40:
net//ipv4/cipso_ipv4.c: In function 'cipso_v4_req_setattr':
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:47:15: note: in definition of macro 'xchg'
__typeof__(*(ptr)) _x_ = (x); \
^~~
>> arch/alpha/include/asm/cmpxchg.h:47:27: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
__typeof__(*(ptr)) _x_ = (x); \
^
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:48:16: note: in definition of macro 'xchg'
(__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, \
^~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:48:31: note: in definition of macro 'xchg'
(__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, \
^~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/alpha/include/asm/cmpxchg.h:49:15: note: in definition of macro 'xchg'
sizeof(*(ptr))); \
^~~
net//ipv4/cipso_ipv4.c: In function 'cipso_v4_req_delattr':
net//ipv4/cipso_ipv4.c:2073:16: error: 'struct inet_request_sock' has no member named 'opt'
opt = req_inet->opt;
^~
net//ipv4/cipso_ipv4.c:2077:27: error: 'struct inet_request_sock' has no member named 'opt'
cipso_v4_delopt(&req_inet->opt);
^~
vim +47 arch/alpha/include/asm/cmpxchg.h
5ba840f9 Paul Gortmaker 2012-04-02 44
5ba840f9 Paul Gortmaker 2012-04-02 45 #define xchg(ptr, x) \
5ba840f9 Paul Gortmaker 2012-04-02 46 ({ \
5ba840f9 Paul Gortmaker 2012-04-02 @47 __typeof__(*(ptr)) _x_ = (x); \
5ba840f9 Paul Gortmaker 2012-04-02 48 (__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, \
5ba840f9 Paul Gortmaker 2012-04-02 49 sizeof(*(ptr))); \
5ba840f9 Paul Gortmaker 2012-04-02 50 })
5ba840f9 Paul Gortmaker 2012-04-02 51
:::::: The code at line 47 was first introduced by commit
:::::: 5ba840f9da1ff96e0c6e982608a9e80e35333cc5 alpha: fix build failures from system.h dismemberment
:::::: TO: Paul Gortmaker <paul.gortmaker@windriver.com>
:::::: CC: Paul Gortmaker <paul.gortmaker@windriver.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Sat, 2017-10-21 at 05:26 +0800, kbuild test robot wrote: > Hi Eric, > > [auto build test WARNING on net/master] Obsolete report. v4 was sent few hours ago ;)
Hi Eric,
[auto build test WARNING on net/master]
url: https://github.com/0day-ci/linux/commits/Eric-Dumazet/dccp-tcp-fix-ireq-opt-races/20171021-034024
config: powerpc-ppc6xx_defconfig (attached as .config)
compiler: powerpc-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=powerpc
All warnings (new ones prefixed by >>):
In file included from arch/powerpc/include/asm/atomic.h:10:0,
from include/linux/atomic.h:4,
from include/linux/rcupdate.h:38,
from net/ipv4/cipso_ipv4.c:40:
net/ipv4/cipso_ipv4.c: In function 'cipso_v4_req_setattr':
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:203:15: note: in definition of macro 'xchg_relaxed'
__typeof__(*(ptr)) _x_ = (x); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
>> arch/powerpc/include/asm/cmpxchg.h:203:27: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
__typeof__(*(ptr)) _x_ = (x); \
^
>> include/linux/atomic.h:65:9: note: in expansion of macro 'xchg_relaxed'
typeof(op##_relaxed(args)) __ret; \
^~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:16: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:39: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:205:33: note: in definition of macro 'xchg_relaxed'
(unsigned long)_x_, sizeof(*(ptr))); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:203:15: note: in definition of macro 'xchg_relaxed'
__typeof__(*(ptr)) _x_ = (x); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
>> arch/powerpc/include/asm/cmpxchg.h:203:27: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
__typeof__(*(ptr)) _x_ = (x); \
^
include/linux/atomic.h:67:10: note: in expansion of macro 'xchg_relaxed'
__ret = op##_relaxed(args); \
^~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:16: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:39: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:205:33: note: in definition of macro 'xchg_relaxed'
(unsigned long)_x_, sizeof(*(ptr))); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net/ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net/ipv4/cipso_ipv4.c:1954:6: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
opt = xchg(&req_inet->opt, opt);
^
net/ipv4/cipso_ipv4.c: In function 'cipso_v4_req_delattr':
net/ipv4/cipso_ipv4.c:2073:16: error: 'struct inet_request_sock' has no member named 'opt'
opt = req_inet->opt;
^~
net/ipv4/cipso_ipv4.c:2077:27: error: 'struct inet_request_sock' has no member named 'opt'
cipso_v4_delopt(&req_inet->opt);
^~
--
In file included from arch/powerpc/include/asm/atomic.h:10:0,
from include/linux/atomic.h:4,
from include/linux/rcupdate.h:38,
from net//ipv4/cipso_ipv4.c:40:
net//ipv4/cipso_ipv4.c: In function 'cipso_v4_req_setattr':
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:203:15: note: in definition of macro 'xchg_relaxed'
__typeof__(*(ptr)) _x_ = (x); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
>> arch/powerpc/include/asm/cmpxchg.h:203:27: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
__typeof__(*(ptr)) _x_ = (x); \
^
>> include/linux/atomic.h:65:9: note: in expansion of macro 'xchg_relaxed'
typeof(op##_relaxed(args)) __ret; \
^~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:16: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:39: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:205:33: note: in definition of macro 'xchg_relaxed'
(unsigned long)_x_, sizeof(*(ptr))); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:203:15: note: in definition of macro 'xchg_relaxed'
__typeof__(*(ptr)) _x_ = (x); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
>> arch/powerpc/include/asm/cmpxchg.h:203:27: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
__typeof__(*(ptr)) _x_ = (x); \
^
include/linux/atomic.h:67:10: note: in expansion of macro 'xchg_relaxed'
__ret = op##_relaxed(args); \
^~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:16: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:204:39: note: in definition of macro 'xchg_relaxed'
(__typeof__(*(ptr))) __xchg_relaxed((ptr), \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:22: error: 'struct inet_request_sock' has no member named 'opt'
opt = xchg(&req_inet->opt, opt);
^
arch/powerpc/include/asm/cmpxchg.h:205:33: note: in definition of macro 'xchg_relaxed'
(unsigned long)_x_, sizeof(*(ptr))); \
^~~
include/linux/atomic.h:517:22: note: in expansion of macro '__atomic_op_fence'
#define xchg(...) __atomic_op_fence(xchg, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
net//ipv4/cipso_ipv4.c:1954:8: note: in expansion of macro 'xchg'
opt = xchg(&req_inet->opt, opt);
^~~~
net//ipv4/cipso_ipv4.c:1954:6: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
opt = xchg(&req_inet->opt, opt);
^
net//ipv4/cipso_ipv4.c: In function 'cipso_v4_req_delattr':
net//ipv4/cipso_ipv4.c:2073:16: error: 'struct inet_request_sock' has no member named 'opt'
opt = req_inet->opt;
^~
net//ipv4/cipso_ipv4.c:2077:27: error: 'struct inet_request_sock' has no member named 'opt'
cipso_v4_delopt(&req_inet->opt);
^~
vim +203 arch/powerpc/include/asm/cmpxchg.h
ae3a197e David Howells 2012-03-28 175
ae3a197e David Howells 2012-03-28 176 static __always_inline unsigned long
26760fc1 Boqun Feng 2015-12-15 177 __xchg_relaxed(void *ptr, unsigned long x, unsigned int size)
ae3a197e David Howells 2012-03-28 178 {
ae3a197e David Howells 2012-03-28 179 switch (size) {
d0563a12 Pan Xinhui 2016-04-27 180 case 1:
d0563a12 Pan Xinhui 2016-04-27 181 return __xchg_u8_relaxed(ptr, x);
d0563a12 Pan Xinhui 2016-04-27 182 case 2:
d0563a12 Pan Xinhui 2016-04-27 183 return __xchg_u16_relaxed(ptr, x);
ae3a197e David Howells 2012-03-28 184 case 4:
26760fc1 Boqun Feng 2015-12-15 185 return __xchg_u32_relaxed(ptr, x);
ae3a197e David Howells 2012-03-28 186 #ifdef CONFIG_PPC64
ae3a197e David Howells 2012-03-28 187 case 8:
26760fc1 Boqun Feng 2015-12-15 188 return __xchg_u64_relaxed(ptr, x);
ae3a197e David Howells 2012-03-28 189 #endif
ae3a197e David Howells 2012-03-28 190 }
10d8b148 pan xinhui 2016-02-23 191 BUILD_BUG_ON_MSG(1, "Unsupported size for __xchg_local");
ae3a197e David Howells 2012-03-28 192 return x;
ae3a197e David Howells 2012-03-28 193 }
26760fc1 Boqun Feng 2015-12-15 194 #define xchg_local(ptr,x) \
ae3a197e David Howells 2012-03-28 195 ({ \
ae3a197e David Howells 2012-03-28 196 __typeof__(*(ptr)) _x_ = (x); \
26760fc1 Boqun Feng 2015-12-15 197 (__typeof__(*(ptr))) __xchg_local((ptr), \
26760fc1 Boqun Feng 2015-12-15 198 (unsigned long)_x_, sizeof(*(ptr))); \
ae3a197e David Howells 2012-03-28 199 })
ae3a197e David Howells 2012-03-28 200
26760fc1 Boqun Feng 2015-12-15 201 #define xchg_relaxed(ptr, x) \
ae3a197e David Howells 2012-03-28 202 ({ \
ae3a197e David Howells 2012-03-28 @203 __typeof__(*(ptr)) _x_ = (x); \
26760fc1 Boqun Feng 2015-12-15 204 (__typeof__(*(ptr))) __xchg_relaxed((ptr), \
ae3a197e David Howells 2012-03-28 205 (unsigned long)_x_, sizeof(*(ptr))); \
ae3a197e David Howells 2012-03-28 206 })
ae3a197e David Howells 2012-03-28 207 /*
ae3a197e David Howells 2012-03-28 208 * Compare and exchange - if *p == old, set it to new,
ae3a197e David Howells 2012-03-28 209 * and return the old value of *p.
ae3a197e David Howells 2012-03-28 210 */
ae3a197e David Howells 2012-03-28 211
:::::: The code at line 203 was first introduced by commit
:::::: ae3a197e3d0bfe3f4bf1693723e82dc018c096f3 Disintegrate asm/system.h for PowerPC
:::::: TO: David Howells <dhowells@redhat.com>
:::::: CC: David Howells <dhowells@redhat.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index aa95053dfc78d35d04aef276e2a5dce7343f72a0..425752f768d2f1a0efb13964204e07f27609e9db 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -96,7 +96,7 @@ struct inet_request_sock { kmemcheck_bitfield_end(flags); u32 ir_mark; union { - struct ip_options_rcu *opt; + struct ip_options_rcu __rcu *ireq_opt; #if IS_ENABLED(CONFIG_IPV6) struct { struct ipv6_txoptions *ipv6_opt; diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 001c08696334bba0ceb896c116e595b814af0667..0490916864f93d5466e87f5b97dc524b3ee57a2e 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -414,8 +414,7 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk, sk_daddr_set(newsk, ireq->ir_rmt_addr); sk_rcv_saddr_set(newsk, ireq->ir_loc_addr); newinet->inet_saddr = ireq->ir_loc_addr; - newinet->inet_opt = ireq->opt; - ireq->opt = NULL; + RCU_INIT_POINTER(newinet->inet_opt, rcu_dereference(ireq->ireq_opt)); newinet->mc_index = inet_iif(skb); newinet->mc_ttl = ip_hdr(skb)->ttl; newinet->inet_id = jiffies; @@ -430,7 +429,10 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk, if (__inet_inherit_port(sk, newsk) < 0) goto put_and_exit; *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash)); - + if (*own_req) + ireq->ireq_opt = NULL; + else + newinet->inet_opt = NULL; return newsk; exit_overflow: @@ -441,6 +443,7 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk, __NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS); return NULL; put_and_exit: + newinet->inet_opt = NULL; inet_csk_prepare_forced_close(newsk); dccp_done(newsk); goto exit; @@ -492,7 +495,7 @@ static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req ireq->ir_rmt_addr); err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr, ireq->ir_rmt_addr, - ireq->opt); + rcu_dereference(ireq->ireq_opt)); err = net_xmit_eval(err); } @@ -548,7 +551,7 @@ static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb) static void dccp_v4_reqsk_destructor(struct request_sock *req) { dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg); - kfree(inet_rsk(req)->opt); + kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1)); } void dccp_syn_ack_timeout(const struct request_sock *req) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 67aec7a106860b26c929fea1624d652c87972f04..5ec9136a7c36933cb36e5cd50058eb6cf189a7c3 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -540,9 +540,10 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk, { const struct inet_request_sock *ireq = inet_rsk(req); struct net *net = read_pnet(&ireq->ireq_net); - struct ip_options_rcu *opt = ireq->opt; + struct ip_options_rcu *opt; struct rtable *rt; + opt = rcu_dereference(ireq->ireq_opt); flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark, RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, sk->sk_protocol, inet_sk_flowi_flags(sk), @@ -576,10 +577,9 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk, struct flowi4 *fl4; struct rtable *rt; + opt = rcu_dereference(ireq->ireq_opt); fl4 = &newinet->cork.fl.u.ip4; - rcu_read_lock(); - opt = rcu_dereference(newinet->inet_opt); flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark, RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, sk->sk_protocol, inet_sk_flowi_flags(sk), @@ -592,13 +592,11 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk, goto no_route; if (opt && opt->opt.is_strictroute && rt->rt_uses_gateway) goto route_err; - rcu_read_unlock(); return &rt->dst; route_err: ip_rt_put(rt); no_route: - rcu_read_unlock(); __IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES); return NULL; } diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index b1bb1b3a108232d56aa82383422d68b5ff9da3ed..77cf32a80952fcf3ceff4ada946cc2d0df2411d9 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c @@ -355,7 +355,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) /* We throwed the options of the initial SYN away, so we hope * the ACK carries the same options again (see RFC1122 4.2.3.8) */ - ireq->opt = tcp_v4_save_options(sock_net(sk), skb); + RCU_INIT_POINTER(ireq->ireq_opt, tcp_v4_save_options(sock_net(sk), skb)); if (security_inet_conn_request(sk, skb, req)) { reqsk_free(req); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c5d7656beeee29b3c92e1c8824dbf00d3fa32d28..7eec3383702bbab497a12095b55d255532ad5f60 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -6196,7 +6196,7 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops, struct inet_request_sock *ireq = inet_rsk(req); kmemcheck_annotate_bitfield(ireq, flags); - ireq->opt = NULL; + ireq->ireq_opt = NULL; #if IS_ENABLED(CONFIG_IPV6) ireq->pktopts = NULL; #endif diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 85164d4d3e537537c87d74c00172592c860d4dfb..4c43365c374c8bf868fc0b862333244ca26d5016 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -877,7 +877,7 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst, err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr, ireq->ir_rmt_addr, - ireq->opt); + rcu_dereference(ireq->ireq_opt)); err = net_xmit_eval(err); } @@ -889,7 +889,7 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst, */ static void tcp_v4_reqsk_destructor(struct request_sock *req) { - kfree(inet_rsk(req)->opt); + kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1)); } #ifdef CONFIG_TCP_MD5SIG @@ -1265,10 +1265,11 @@ static void tcp_v4_init_req(struct request_sock *req, struct sk_buff *skb) { struct inet_request_sock *ireq = inet_rsk(req); + struct net *net = sock_net(sk_listener); sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)->daddr); sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr); - ireq->opt = tcp_v4_save_options(sock_net(sk_listener), skb); + RCU_INIT_POINTER(ireq->ireq_opt, tcp_v4_save_options(net, skb)); } static struct dst_entry *tcp_v4_route_req(const struct sock *sk, @@ -1355,10 +1356,9 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb, sk_daddr_set(newsk, ireq->ir_rmt_addr); sk_rcv_saddr_set(newsk, ireq->ir_loc_addr); newsk->sk_bound_dev_if = ireq->ir_iif; - newinet->inet_saddr = ireq->ir_loc_addr; - inet_opt = ireq->opt; - rcu_assign_pointer(newinet->inet_opt, inet_opt); - ireq->opt = NULL; + newinet->inet_saddr = ireq->ir_loc_addr; + inet_opt = rcu_dereference(ireq->ireq_opt); + RCU_INIT_POINTER(newinet->inet_opt, inet_opt); newinet->mc_index = inet_iif(skb); newinet->mc_ttl = ip_hdr(skb)->ttl; newinet->rcv_tos = ip_hdr(skb)->tos; @@ -1403,9 +1403,12 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb, if (__inet_inherit_port(sk, newsk) < 0) goto put_and_exit; *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash)); - if (*own_req) + if (likely(*own_req)) { tcp_move_syn(newtp, req); - + ireq->ireq_opt = NULL; + } else { + newinet->inet_opt = NULL; + } return newsk; exit_overflow: @@ -1416,6 +1419,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb, tcp_listendrop(sk); return NULL; put_and_exit: + newinet->inet_opt = NULL; inet_csk_prepare_forced_close(newsk); tcp_done(newsk); goto exit;