Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
d8d8f6a4
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
152
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d8d8f6a4
编写于
1月 06, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
上级
57d1c91f
a2167dc6
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
37 addition
and
44 deletion
+37
-44
include/linux/filter.h
include/linux/filter.h
+1
-1
include/linux/inet.h
include/linux/inet.h
+1
-1
include/linux/ip.h
include/linux/ip.h
+5
-5
include/net/sock.h
include/net/sock.h
+2
-2
net/atm/br2684.c
net/atm/br2684.c
+1
-1
net/bridge/br_input.c
net/bridge/br_input.c
+1
-1
net/bridge/br_netfilter.c
net/bridge/br_netfilter.c
+9
-4
net/core/filter.c
net/core/filter.c
+3
-3
net/core/pktgen.c
net/core/pktgen.c
+2
-3
net/core/utils.c
net/core/utils.c
+1
-1
net/ethernet/eth.c
net/ethernet/eth.c
+1
-1
net/ipv4/ip_fragment.c
net/ipv4/ip_fragment.c
+1
-1
net/ipv4/ip_output.c
net/ipv4/ip_output.c
+2
-2
net/ipv4/ipvs/ip_vs_xmit.c
net/ipv4/ipvs/ip_vs_xmit.c
+1
-1
net/ipv4/netfilter/ipt_helper.c
net/ipv4/netfilter/ipt_helper.c
+1
-0
net/x25/af_x25.c
net/x25/af_x25.c
+1
-6
net/xfrm/xfrm_user.c
net/xfrm/xfrm_user.c
+1
-0
security/selinux/include/av_perm_to_string.h
security/selinux/include/av_perm_to_string.h
+1
-2
security/selinux/include/av_permissions.h
security/selinux/include/av_permissions.h
+1
-2
security/selinux/xfrm.c
security/selinux/xfrm.c
+1
-7
未找到文件。
include/linux/filter.h
浏览文件 @
d8d8f6a4
...
...
@@ -143,7 +143,7 @@ static inline unsigned int sk_filter_len(struct sk_filter *fp)
struct
sk_buff
;
struct
sock
;
extern
int
sk_run_filter
(
struct
sk_buff
*
skb
,
struct
sock_filter
*
filter
,
int
flen
);
extern
unsigned
int
sk_run_filter
(
struct
sk_buff
*
skb
,
struct
sock_filter
*
filter
,
int
flen
);
extern
int
sk_attach_filter
(
struct
sock_fprog
*
fprog
,
struct
sock
*
sk
);
extern
int
sk_chk_filter
(
struct
sock_filter
*
filter
,
int
flen
);
#endif
/* __KERNEL__ */
...
...
include/linux/inet.h
浏览文件 @
d8d8f6a4
...
...
@@ -45,6 +45,6 @@
#ifdef __KERNEL__
#include <linux/types.h>
extern
__
u
32
in_aton
(
const
char
*
str
);
extern
__
be
32
in_aton
(
const
char
*
str
);
#endif
#endif
/* _LINUX_INET_H */
include/linux/ip.h
浏览文件 @
d8d8f6a4
...
...
@@ -90,14 +90,14 @@ struct iphdr {
#error "Please fix <asm/byteorder.h>"
#endif
__u8
tos
;
__
u
16
tot_len
;
__
u
16
id
;
__
u
16
frag_off
;
__
be
16
tot_len
;
__
be
16
id
;
__
be
16
frag_off
;
__u8
ttl
;
__u8
protocol
;
__u16
check
;
__
u
32
saddr
;
__
u
32
daddr
;
__
be
32
saddr
;
__
be
32
daddr
;
/*The options start here. */
};
...
...
include/net/sock.h
浏览文件 @
d8d8f6a4
...
...
@@ -856,8 +856,8 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock)
filter
=
sk
->
sk_filter
;
if
(
filter
)
{
int
pkt_len
=
sk_run_filter
(
skb
,
filter
->
insns
,
filter
->
len
);
unsigned
int
pkt_len
=
sk_run_filter
(
skb
,
filter
->
insns
,
filter
->
len
);
if
(
!
pkt_len
)
err
=
-
EPERM
;
else
...
...
net/atm/br2684.c
浏览文件 @
d8d8f6a4
...
...
@@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev)
unsigned
char
*
rawp
;
eth
=
eth_hdr
(
skb
);
if
(
*
eth
->
h_dest
&
1
)
{
if
(
is_multicast_ether_addr
(
eth
->
h_dest
)
)
{
if
(
memcmp
(
eth
->
h_dest
,
dev
->
broadcast
,
ETH_ALEN
)
==
0
)
skb
->
pkt_type
=
PACKET_BROADCAST
;
else
...
...
net/bridge/br_input.c
浏览文件 @
d8d8f6a4
...
...
@@ -68,7 +68,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
}
}
if
(
dest
[
0
]
&
1
)
{
if
(
is_multicast_ether_addr
(
dest
)
)
{
br_flood_forward
(
br
,
skb
,
!
passedup
);
if
(
!
passedup
)
br_pass_frame_up
(
br
,
skb
);
...
...
net/bridge/br_netfilter.c
浏览文件 @
d8d8f6a4
...
...
@@ -394,8 +394,9 @@ static unsigned int br_nf_pre_routing_ipv6(unsigned int hook,
* target in particular. Save the original destination IP
* address to be able to detect DNAT afterwards. */
static
unsigned
int
br_nf_pre_routing
(
unsigned
int
hook
,
struct
sk_buff
**
pskb
,
const
struct
net_device
*
in
,
const
struct
net_device
*
out
,
int
(
*
okfn
)(
struct
sk_buff
*
))
const
struct
net_device
*
in
,
const
struct
net_device
*
out
,
int
(
*
okfn
)(
struct
sk_buff
*
))
{
struct
iphdr
*
iph
;
__u32
len
;
...
...
@@ -412,8 +413,10 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
goto
out
;
if
(
skb
->
protocol
==
__constant_htons
(
ETH_P_8021Q
))
{
u8
*
vhdr
=
skb
->
data
;
skb_pull
(
skb
,
VLAN_HLEN
);
(
skb
)
->
nh
.
raw
+=
VLAN_HLEN
;
skb_postpull_rcsum
(
skb
,
vhdr
,
VLAN_HLEN
);
skb
->
nh
.
raw
+=
VLAN_HLEN
;
}
return
br_nf_pre_routing_ipv6
(
hook
,
skb
,
in
,
out
,
okfn
);
}
...
...
@@ -429,8 +432,10 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
goto
out
;
if
(
skb
->
protocol
==
__constant_htons
(
ETH_P_8021Q
))
{
u8
*
vhdr
=
skb
->
data
;
skb_pull
(
skb
,
VLAN_HLEN
);
(
skb
)
->
nh
.
raw
+=
VLAN_HLEN
;
skb_postpull_rcsum
(
skb
,
vhdr
,
VLAN_HLEN
);
skb
->
nh
.
raw
+=
VLAN_HLEN
;
}
if
(
!
pskb_may_pull
(
skb
,
sizeof
(
struct
iphdr
)))
...
...
net/core/filter.c
浏览文件 @
d8d8f6a4
...
...
@@ -75,7 +75,7 @@ static inline void *load_pointer(struct sk_buff *skb, int k,
* len is the number of filter blocks in the array.
*/
int
sk_run_filter
(
struct
sk_buff
*
skb
,
struct
sock_filter
*
filter
,
int
flen
)
unsigned
int
sk_run_filter
(
struct
sk_buff
*
skb
,
struct
sock_filter
*
filter
,
int
flen
)
{
struct
sock_filter
*
fentry
;
/* We walk down these */
void
*
ptr
;
...
...
@@ -241,9 +241,9 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
A
=
X
;
continue
;
case
BPF_RET
|
BPF_K
:
return
((
unsigned
int
)
fentry
->
k
)
;
return
fentry
->
k
;
case
BPF_RET
|
BPF_A
:
return
((
unsigned
int
)
A
)
;
return
A
;
case
BPF_ST
:
mem
[
fentry
->
k
]
=
A
;
continue
;
...
...
net/core/pktgen.c
浏览文件 @
d8d8f6a4
...
...
@@ -473,7 +473,6 @@ static char version[] __initdata = VERSION;
static
int
pktgen_remove_device
(
struct
pktgen_thread
*
t
,
struct
pktgen_dev
*
i
);
static
int
pktgen_add_device
(
struct
pktgen_thread
*
t
,
const
char
*
ifname
);
static
struct
pktgen_thread
*
pktgen_find_thread
(
const
char
*
name
);
static
struct
pktgen_dev
*
pktgen_find_dev
(
struct
pktgen_thread
*
t
,
const
char
*
ifname
);
static
int
pktgen_device_event
(
struct
notifier_block
*
,
unsigned
long
,
void
*
);
static
void
pktgen_run_all_threads
(
void
);
...
...
@@ -2883,7 +2882,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char* ifname)
return
add_dev_to_thread
(
t
,
pkt_dev
);
}
static
struct
pktgen_thread
*
pktgen_find_thread
(
const
char
*
name
)
static
struct
pktgen_thread
*
__init
pktgen_find_thread
(
const
char
*
name
)
{
struct
pktgen_thread
*
t
=
NULL
;
...
...
@@ -2900,7 +2899,7 @@ static struct pktgen_thread *pktgen_find_thread(const char* name)
return
t
;
}
static
int
pktgen_create_thread
(
const
char
*
name
,
int
cpu
)
static
int
__init
pktgen_create_thread
(
const
char
*
name
,
int
cpu
)
{
struct
pktgen_thread
*
t
=
NULL
;
struct
proc_dir_entry
*
pe
;
...
...
net/core/utils.c
浏览文件 @
d8d8f6a4
...
...
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(net_srandom);
* is otherwise not dependent on the TCP/IP stack.
*/
__
u
32
in_aton
(
const
char
*
str
)
__
be
32
in_aton
(
const
char
*
str
)
{
unsigned
long
l
;
unsigned
int
val
;
...
...
net/ethernet/eth.c
浏览文件 @
d8d8f6a4
...
...
@@ -163,7 +163,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
skb_pull
(
skb
,
ETH_HLEN
);
eth
=
eth_hdr
(
skb
);
if
(
*
eth
->
h_dest
&
1
)
{
if
(
is_multicast_ether_addr
(
eth
->
h_dest
)
)
{
if
(
!
compare_ether_addr
(
eth
->
h_dest
,
dev
->
broadcast
))
skb
->
pkt_type
=
PACKET_BROADCAST
;
else
...
...
net/ipv4/ip_fragment.c
浏览文件 @
d8d8f6a4
...
...
@@ -383,7 +383,7 @@ static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user)
*/
static
inline
struct
ipq
*
ip_find
(
struct
iphdr
*
iph
,
u32
user
)
{
__
u
16
id
=
iph
->
id
;
__
be
16
id
=
iph
->
id
;
__u32
saddr
=
iph
->
saddr
;
__u32
daddr
=
iph
->
daddr
;
__u8
protocol
=
iph
->
protocol
;
...
...
net/ipv4/ip_output.c
浏览文件 @
d8d8f6a4
...
...
@@ -418,7 +418,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
struct
sk_buff
*
skb2
;
unsigned
int
mtu
,
hlen
,
left
,
len
,
ll_rs
;
int
offset
;
int
not_last_frag
;
__be16
not_last_frag
;
struct
rtable
*
rt
=
(
struct
rtable
*
)
skb
->
dst
;
int
err
=
0
;
...
...
@@ -1180,7 +1180,7 @@ int ip_push_pending_frames(struct sock *sk)
struct
ip_options
*
opt
=
NULL
;
struct
rtable
*
rt
=
inet
->
cork
.
rt
;
struct
iphdr
*
iph
;
int
df
=
0
;
__be16
df
=
0
;
__u8
ttl
;
int
err
=
0
;
...
...
net/ipv4/ipvs/ip_vs_xmit.c
浏览文件 @
d8d8f6a4
...
...
@@ -322,7 +322,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
struct
net_device
*
tdev
;
/* Device to other host */
struct
iphdr
*
old_iph
=
skb
->
nh
.
iph
;
u8
tos
=
old_iph
->
tos
;
u16
df
=
old_iph
->
frag_off
;
__be16
df
=
old_iph
->
frag_off
;
struct
iphdr
*
iph
;
/* Our new IP header */
int
max_headroom
;
/* The extra header space needed */
int
mtu
;
...
...
net/ipv4/netfilter/ipt_helper.c
浏览文件 @
d8d8f6a4
...
...
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter.h>
#include <linux/interrupt.h>
#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
#include <linux/netfilter_ipv4/ip_conntrack.h>
#include <linux/netfilter_ipv4/ip_conntrack_core.h>
...
...
net/x25/af_x25.c
浏览文件 @
d8d8f6a4
...
...
@@ -540,12 +540,7 @@ static struct sock *x25_make_new(struct sock *osk)
sk
->
sk_state
=
TCP_ESTABLISHED
;
sk
->
sk_sleep
=
osk
->
sk_sleep
;
sk
->
sk_backlog_rcv
=
osk
->
sk_backlog_rcv
;
if
(
sock_flag
(
osk
,
SOCK_ZAPPED
))
sock_set_flag
(
sk
,
SOCK_ZAPPED
);
if
(
sock_flag
(
osk
,
SOCK_DBG
))
sock_set_flag
(
sk
,
SOCK_DBG
);
sock_copy_flags
(
sk
,
osk
);
ox25
=
x25_sk
(
osk
);
x25
->
t21
=
ox25
->
t21
;
...
...
net/xfrm/xfrm_user.c
浏览文件 @
d8d8f6a4
...
...
@@ -802,6 +802,7 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfr
excl
=
nlh
->
nlmsg_type
==
XFRM_MSG_NEWPOLICY
;
err
=
xfrm_policy_insert
(
p
->
dir
,
xp
,
excl
);
if
(
err
)
{
security_xfrm_policy_free
(
xp
);
kfree
(
xp
);
return
err
;
}
...
...
security/selinux/include/av_perm_to_string.h
浏览文件 @
d8d8f6a4
...
...
@@ -238,5 +238,4 @@
S_
(
SECCLASS_NSCD
,
NSCD__SHMEMHOST
,
"shmemhost"
)
S_
(
SECCLASS_ASSOCIATION
,
ASSOCIATION__SENDTO
,
"sendto"
)
S_
(
SECCLASS_ASSOCIATION
,
ASSOCIATION__RECVFROM
,
"recvfrom"
)
S_
(
SECCLASS_ASSOCIATION
,
ASSOCIATION__RELABELFROM
,
"relabelfrom"
)
S_
(
SECCLASS_ASSOCIATION
,
ASSOCIATION__RELABELTO
,
"relabelto"
)
S_
(
SECCLASS_ASSOCIATION
,
ASSOCIATION__SETCONTEXT
,
"setcontext"
)
security/selinux/include/av_permissions.h
浏览文件 @
d8d8f6a4
...
...
@@ -908,8 +908,7 @@
#define ASSOCIATION__SENDTO 0x00000001UL
#define ASSOCIATION__RECVFROM 0x00000002UL
#define ASSOCIATION__RELABELFROM 0x00000004UL
#define ASSOCIATION__RELABELTO 0x00000008UL
#define ASSOCIATION__SETCONTEXT 0x00000004UL
#define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL
#define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL
...
...
security/selinux/xfrm.c
浏览文件 @
d8d8f6a4
...
...
@@ -137,15 +137,9 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_us
* Must be permitted to relabel from default socket type (process type)
* to specified context
*/
rc
=
avc_has_perm
(
tsec
->
sid
,
tsec
->
sid
,
SECCLASS_ASSOCIATION
,
ASSOCIATION__RELABELFROM
,
NULL
);
if
(
rc
)
goto
out
;
rc
=
avc_has_perm
(
tsec
->
sid
,
ctx
->
ctx_sid
,
SECCLASS_ASSOCIATION
,
ASSOCIATION__
RELABELTO
,
NULL
);
ASSOCIATION__
SETCONTEXT
,
NULL
);
if
(
rc
)
goto
out
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录