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
8c56c3fb
Commit
8c56c3fb
authored
Mar 23, 2003
by
Hideaki Yoshifuji
Committed by
David S. Miller
Mar 23, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[IPV6]: Fix BUG 483, do not call crypto_alloc_tfm from illegal context.
parent
bed9655b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
10 deletions
+28
-10
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+28
-10
No files found.
net/ipv6/addrconf.c
View file @
8c56c3fb
...
@@ -97,6 +97,8 @@ static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpad
...
@@ -97,6 +97,8 @@ static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpad
static
void
ipv6_regen_rndid
(
unsigned
long
data
);
static
void
ipv6_regen_rndid
(
unsigned
long
data
);
static
int
desync_factor
=
MAX_DESYNC_FACTOR
*
HZ
;
static
int
desync_factor
=
MAX_DESYNC_FACTOR
*
HZ
;
static
struct
crypto_tfm
*
md5_tfm
;
static
spinlock_t
md5_tfm_lock
=
SPIN_LOCK_UNLOCKED
;
#endif
#endif
static
int
ipv6_count_addresses
(
struct
inet6_dev
*
idev
);
static
int
ipv6_count_addresses
(
struct
inet6_dev
*
idev
);
...
@@ -1045,7 +1047,6 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
...
@@ -1045,7 +1047,6 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
struct
net_device
*
dev
;
struct
net_device
*
dev
;
u8
eui64
[
8
];
u8
eui64
[
8
];
u8
digest
[
16
];
u8
digest
[
16
];
struct
crypto_tfm
*
tfm
;
struct
scatterlist
sg
[
2
];
struct
scatterlist
sg
[
2
];
sg
[
0
].
page
=
virt_to_page
(
idev
->
entropy
);
sg
[
0
].
page
=
virt_to_page
(
idev
->
entropy
);
...
@@ -1067,18 +1068,16 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
...
@@ -1067,18 +1068,16 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
get_random_bytes
(
eui64
,
sizeof
(
eui64
));
get_random_bytes
(
eui64
,
sizeof
(
eui64
));
}
}
regen:
regen:
tfm
=
crypto_alloc_tfm
(
"md5"
,
0
);
spin_lock
(
&
md5_tfm_lock
);
if
(
tfm
==
NULL
)
{
if
(
unlikely
(
md5_tfm
==
NULL
))
{
if
(
net_ratelimit
())
spin_unlock
(
&
md5_tfm_lock
);
printk
(
KERN_WARNING
"failed to load transform for md5
\n
"
);
in6_dev_put
(
idev
);
in6_dev_put
(
idev
);
return
-
1
;
return
-
1
;
}
}
crypto_digest_init
(
tfm
);
crypto_digest_init
(
md5_
tfm
);
crypto_digest_update
(
tfm
,
sg
,
2
);
crypto_digest_update
(
md5_
tfm
,
sg
,
2
);
crypto_digest_final
(
tfm
,
digest
);
crypto_digest_final
(
md5_
tfm
,
digest
);
crypto_free_tfm
(
tfm
);
spin_unlock
(
&
md5_tfm_lock
);
memcpy
(
idev
->
rndid
,
&
digest
[
0
],
8
);
memcpy
(
idev
->
rndid
,
&
digest
[
0
],
8
);
idev
->
rndid
[
0
]
&=
~
0x02
;
idev
->
rndid
[
0
]
&=
~
0x02
;
...
@@ -1106,6 +1105,9 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
...
@@ -1106,6 +1105,9 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
goto
regen
;
goto
regen
;
}
}
idev
->
regen_timer
.
expires
=
jiffies
+
idev
->
cnf
.
temp_prefered_lft
*
HZ
-
idev
->
cnf
.
regen_max_retry
*
idev
->
cnf
.
dad_transmits
*
idev
->
nd_parms
->
retrans_time
-
desync_factor
;
if
(
time_before
(
idev
->
regen_timer
.
expires
,
jiffies
))
{
if
(
time_before
(
idev
->
regen_timer
.
expires
,
jiffies
))
{
idev
->
regen_timer
.
expires
=
0
;
idev
->
regen_timer
.
expires
=
0
;
printk
(
KERN_WARNING
printk
(
KERN_WARNING
...
@@ -2647,7 +2649,16 @@ void __init addrconf_init(void)
...
@@ -2647,7 +2649,16 @@ void __init addrconf_init(void)
{
{
#ifdef MODULE
#ifdef MODULE
struct
net_device
*
dev
;
struct
net_device
*
dev
;
#endif
#ifdef CONFIG_IPV6_PRIVACY
md5_tfm
=
crypto_alloc_tfm
(
"md5"
,
0
);
if
(
unlikely
(
md5_tfm
==
NULL
))
printk
(
KERN_WARNING
"failed to load transform for md5
\n
"
);
#endif
#ifdef MODULE
/* This takes sense only during module load. */
/* This takes sense only during module load. */
rtnl_lock
();
rtnl_lock
();
for
(
dev
=
dev_base
;
dev
;
dev
=
dev
->
next
)
{
for
(
dev
=
dev_base
;
dev
;
dev
=
dev
->
next
)
{
...
@@ -2732,6 +2743,13 @@ void addrconf_cleanup(void)
...
@@ -2732,6 +2743,13 @@ void addrconf_cleanup(void)
rtnl_unlock
();
rtnl_unlock
();
#ifdef CONFIG_IPV6_PRIVACY
if
(
likely
(
md5_tfm
!=
NULL
))
{
crypto_free_tfm
(
md5_tfm
);
md5_tfm
=
NULL
;
}
#endif
#ifdef CONFIG_PROC_FS
#ifdef CONFIG_PROC_FS
proc_net_remove
(
"if_inet6"
);
proc_net_remove
(
"if_inet6"
);
#endif
#endif
...
...
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