Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
290fdc70
Commit
290fdc70
authored
May 31, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/acme/sock-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents
b34b4482
3ee81afa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
drivers/net/ppp_generic.c
drivers/net/ppp_generic.c
+3
-1
include/linux/xfrm.h
include/linux/xfrm.h
+2
-2
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_policy.c
+0
-1
net/xfrm/xfrm_user.c
net/xfrm/xfrm_user.c
+3
-3
No files found.
drivers/net/ppp_generic.c
View file @
290fdc70
...
@@ -682,8 +682,10 @@ static int ppp_ioctl(struct inode *inode, struct file *file,
...
@@ -682,8 +682,10 @@ static int ppp_ioctl(struct inode *inode, struct file *file,
if
(
code
==
0
)
if
(
code
==
0
)
break
;
break
;
err
=
-
EFAULT
;
err
=
-
EFAULT
;
if
(
copy_from_user
(
code
,
uprog
.
filter
,
len
))
if
(
copy_from_user
(
code
,
uprog
.
filter
,
len
))
{
kfree
(
code
);
break
;
break
;
}
err
=
sk_chk_filter
(
code
,
uprog
.
len
);
err
=
sk_chk_filter
(
code
,
uprog
.
len
);
if
(
err
)
{
if
(
err
)
{
kfree
(
code
);
kfree
(
code
);
...
...
include/linux/xfrm.h
View file @
290fdc70
...
@@ -44,7 +44,7 @@ struct xfrm_selector
...
@@ -44,7 +44,7 @@ struct xfrm_selector
uid_t
user
;
uid_t
user
;
};
};
#define XFRM_INF (~(u64)0)
#define XFRM_INF (~(
__
u64)0)
struct
xfrm_lifetime_cfg
struct
xfrm_lifetime_cfg
{
{
...
@@ -164,7 +164,7 @@ struct xfrm_usersa_info {
...
@@ -164,7 +164,7 @@ struct xfrm_usersa_info {
};
};
struct
xfrm_usersa_id
{
struct
xfrm_usersa_id
{
xfrm_address_t
s
addr
;
xfrm_address_t
d
addr
;
__u32
spi
;
__u32
spi
;
__u16
family
;
__u16
family
;
__u8
proto
;
__u8
proto
;
...
...
net/xfrm/xfrm_policy.c
View file @
290fdc70
...
@@ -280,7 +280,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
...
@@ -280,7 +280,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
write_unlock_bh
(
&
xfrm_policy_lock
);
write_unlock_bh
(
&
xfrm_policy_lock
);
if
(
delpol
)
{
if
(
delpol
)
{
atomic_dec
(
&
delpol
->
refcnt
);
xfrm_policy_kill
(
delpol
);
xfrm_policy_kill
(
delpol
);
xfrm_pol_put
(
delpol
);
xfrm_pol_put
(
delpol
);
}
}
...
...
net/xfrm/xfrm_user.c
View file @
290fdc70
...
@@ -260,7 +260,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
...
@@ -260,7 +260,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
if
(
!
x
)
if
(
!
x
)
return
err
;
return
err
;
x1
=
xfrm_state_lookup
(
&
x
->
props
.
s
addr
,
x
->
id
.
spi
,
x
->
id
.
proto
,
x
->
props
.
family
);
x1
=
xfrm_state_lookup
(
&
x
->
id
.
d
addr
,
x
->
id
.
spi
,
x
->
id
.
proto
,
x
->
props
.
family
);
if
(
x1
)
{
if
(
x1
)
{
xfrm_state_put
(
x
);
xfrm_state_put
(
x
);
xfrm_state_put
(
x1
);
xfrm_state_put
(
x1
);
...
@@ -277,7 +277,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
...
@@ -277,7 +277,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
struct
xfrm_state
*
x
;
struct
xfrm_state
*
x
;
struct
xfrm_usersa_id
*
p
=
NLMSG_DATA
(
nlh
);
struct
xfrm_usersa_id
*
p
=
NLMSG_DATA
(
nlh
);
x
=
xfrm_state_lookup
(
&
p
->
s
addr
,
p
->
spi
,
p
->
proto
,
p
->
family
);
x
=
xfrm_state_lookup
(
&
p
->
d
addr
,
p
->
spi
,
p
->
proto
,
p
->
family
);
if
(
x
==
NULL
)
if
(
x
==
NULL
)
return
-
ESRCH
;
return
-
ESRCH
;
...
@@ -403,7 +403,7 @@ static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
...
@@ -403,7 +403,7 @@ static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
struct
sk_buff
*
resp_skb
;
struct
sk_buff
*
resp_skb
;
int
err
;
int
err
;
x
=
xfrm_state_lookup
(
&
p
->
s
addr
,
p
->
spi
,
p
->
proto
,
p
->
family
);
x
=
xfrm_state_lookup
(
&
p
->
d
addr
,
p
->
spi
,
p
->
proto
,
p
->
family
);
err
=
-
ESRCH
;
err
=
-
ESRCH
;
if
(
x
==
NULL
)
if
(
x
==
NULL
)
goto
out_noput
;
goto
out_noput
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment