Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iproute2
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
iproute2
Commits
71058eb8
Commit
71058eb8
authored
Sep 01, 2004
by
osdl.net!shemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ip command to not crash when interface name is too long.
always use strncpy(.., IFNAMSIZ) (Logical change 1.79)
parent
139a7898
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
26 deletions
+30
-26
ChangeLog
ChangeLog
+5
-0
ip/iplink.c
ip/iplink.c
+13
-13
ip/iptunnel.c
ip/iptunnel.c
+12
-13
No files found.
ChangeLog
View file @
71058eb8
2004-09-01 Stephen Hemminger <shemminger@osdl.org>
* Fix ip command to not crash when interface name is too long.
always use strncpy(.., IFNAMSIZ)
2004-08-31 Stephen Hemminger <shemminger@osdl.org>
* Add gact documentation from jamal
...
...
ip/iplink.c
View file @
71058eb8
...
...
@@ -82,13 +82,13 @@ static int get_ctl_fd(void)
return
-
1
;
}
static
int
do_chflags
(
char
*
dev
,
__u32
flags
,
__u32
mask
)
static
int
do_chflags
(
c
onst
c
har
*
dev
,
__u32
flags
,
__u32
mask
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
fd
=
get_ctl_fd
();
if
(
fd
<
0
)
return
-
1
;
...
...
@@ -109,14 +109,14 @@ static int do_chflags(char *dev, __u32 flags, __u32 mask)
return
err
;
}
static
int
do_changename
(
c
har
*
dev
,
char
*
newdev
)
static
int
do_changename
(
c
onst
char
*
dev
,
const
char
*
newdev
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
cpy
(
ifr
.
ifr_newname
,
newdev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
str
ncpy
(
ifr
.
ifr_newname
,
newdev
,
IFNAMSIZ
);
fd
=
get_ctl_fd
();
if
(
fd
<
0
)
return
-
1
;
...
...
@@ -130,7 +130,7 @@ static int do_changename(char *dev, char *newdev)
return
err
;
}
static
int
set_qlen
(
char
*
dev
,
int
qlen
)
static
int
set_qlen
(
c
onst
c
har
*
dev
,
int
qlen
)
{
struct
ifreq
ifr
;
int
s
;
...
...
@@ -140,7 +140,7 @@ static int set_qlen(char *dev, int qlen)
return
-
1
;
memset
(
&
ifr
,
0
,
sizeof
(
ifr
));
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
ifr
.
ifr_qlen
=
qlen
;
if
(
ioctl
(
s
,
SIOCSIFTXQLEN
,
&
ifr
)
<
0
)
{
perror
(
"SIOCSIFXQLEN"
);
...
...
@@ -152,7 +152,7 @@ static int set_qlen(char *dev, int qlen)
return
0
;
}
static
int
set_mtu
(
char
*
dev
,
int
mtu
)
static
int
set_mtu
(
c
onst
c
har
*
dev
,
int
mtu
)
{
struct
ifreq
ifr
;
int
s
;
...
...
@@ -162,7 +162,7 @@ static int set_mtu(char *dev, int mtu)
return
-
1
;
memset
(
&
ifr
,
0
,
sizeof
(
ifr
));
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
ifr
.
ifr_mtu
=
mtu
;
if
(
ioctl
(
s
,
SIOCSIFMTU
,
&
ifr
)
<
0
)
{
perror
(
"SIOCSIFMTU"
);
...
...
@@ -174,7 +174,7 @@ static int set_mtu(char *dev, int mtu)
return
0
;
}
static
int
get_address
(
char
*
dev
,
int
*
htype
)
static
int
get_address
(
c
onst
c
har
*
dev
,
int
*
htype
)
{
struct
ifreq
ifr
;
struct
sockaddr_ll
me
;
...
...
@@ -188,7 +188,7 @@ static int get_address(char *dev, int *htype)
}
memset
(
&
ifr
,
0
,
sizeof
(
ifr
));
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
if
(
ioctl
(
s
,
SIOCGIFINDEX
,
&
ifr
)
<
0
)
{
perror
(
"SIOCGIFINDEX"
);
close
(
s
);
...
...
@@ -216,12 +216,12 @@ static int get_address(char *dev, int *htype)
return
me
.
sll_halen
;
}
static
int
parse_address
(
char
*
dev
,
int
hatype
,
int
halen
,
char
*
lla
,
struct
ifreq
*
ifr
)
static
int
parse_address
(
c
onst
c
har
*
dev
,
int
hatype
,
int
halen
,
char
*
lla
,
struct
ifreq
*
ifr
)
{
int
alen
;
memset
(
ifr
,
0
,
sizeof
(
*
ifr
));
str
cpy
(
ifr
->
ifr_name
,
dev
);
str
ncpy
(
ifr
->
ifr_name
,
dev
,
IFNAMSIZ
);
ifr
->
ifr_hwaddr
.
sa_family
=
hatype
;
alen
=
ll_addr_a2n
(
ifr
->
ifr_hwaddr
.
sa_data
,
14
,
lla
);
if
(
alen
<
0
)
...
...
ip/iptunnel.c
View file @
71058eb8
...
...
@@ -52,13 +52,13 @@ static void usage(void)
exit
(
-
1
);
}
static
int
do_ioctl_get_ifindex
(
char
*
dev
)
static
int
do_ioctl_get_ifindex
(
c
onst
c
har
*
dev
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
fd
=
socket
(
AF_INET
,
SOCK_DGRAM
,
0
);
err
=
ioctl
(
fd
,
SIOCGIFINDEX
,
&
ifr
);
if
(
err
)
{
...
...
@@ -69,13 +69,13 @@ static int do_ioctl_get_ifindex(char *dev)
return
ifr
.
ifr_ifindex
;
}
static
int
do_ioctl_get_iftype
(
char
*
dev
)
static
int
do_ioctl_get_iftype
(
c
onst
c
har
*
dev
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
str
cpy
(
ifr
.
ifr_name
,
dev
);
str
ncpy
(
ifr
.
ifr_name
,
dev
,
IFNAMSIZ
);
fd
=
socket
(
AF_INET
,
SOCK_DGRAM
,
0
);
err
=
ioctl
(
fd
,
SIOCGIFHWADDR
,
&
ifr
);
if
(
err
)
{
...
...
@@ -105,14 +105,13 @@ static char * do_ioctl_get_ifname(int idx)
}
static
int
do_get_ioctl
(
char
*
basedev
,
struct
ip_tunnel_parm
*
p
)
static
int
do_get_ioctl
(
const
char
*
basedev
,
struct
ip_tunnel_parm
*
p
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
str
cpy
(
ifr
.
ifr_name
,
basedev
);
str
ncpy
(
ifr
.
ifr_name
,
basedev
,
IFNAMSIZ
);
ifr
.
ifr_ifru
.
ifru_data
=
(
void
*
)
p
;
fd
=
socket
(
AF_INET
,
SOCK_DGRAM
,
0
);
err
=
ioctl
(
fd
,
SIOCGETTUNNEL
,
&
ifr
);
...
...
@@ -122,16 +121,16 @@ static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p)
return
err
;
}
static
int
do_add_ioctl
(
int
cmd
,
char
*
basedev
,
struct
ip_tunnel_parm
*
p
)
static
int
do_add_ioctl
(
int
cmd
,
c
onst
c
har
*
basedev
,
struct
ip_tunnel_parm
*
p
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
if
(
cmd
==
SIOCCHGTUNNEL
&&
p
->
name
[
0
])
str
cpy
(
ifr
.
ifr_name
,
p
->
name
);
str
ncpy
(
ifr
.
ifr_name
,
p
->
name
,
IFNAMSIZ
);
else
str
cpy
(
ifr
.
ifr_name
,
basedev
);
str
ncpy
(
ifr
.
ifr_name
,
basedev
,
IFNAMSIZ
);
ifr
.
ifr_ifru
.
ifru_data
=
(
void
*
)
p
;
fd
=
socket
(
AF_INET
,
SOCK_DGRAM
,
0
);
err
=
ioctl
(
fd
,
cmd
,
&
ifr
);
...
...
@@ -141,16 +140,16 @@ static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p)
return
err
;
}
static
int
do_del_ioctl
(
char
*
basedev
,
struct
ip_tunnel_parm
*
p
)
static
int
do_del_ioctl
(
c
onst
c
har
*
basedev
,
struct
ip_tunnel_parm
*
p
)
{
struct
ifreq
ifr
;
int
fd
;
int
err
;
if
(
p
->
name
[
0
])
str
cpy
(
ifr
.
ifr_name
,
p
->
name
);
str
ncpy
(
ifr
.
ifr_name
,
p
->
name
,
IFNAMSIZ
);
else
str
cpy
(
ifr
.
ifr_name
,
basedev
);
str
ncpy
(
ifr
.
ifr_name
,
basedev
,
IFNAMSIZ
);
ifr
.
ifr_ifru
.
ifru_data
=
(
void
*
)
p
;
fd
=
socket
(
AF_INET
,
SOCK_DGRAM
,
0
);
err
=
ioctl
(
fd
,
SIOCDELTUNNEL
,
&
ifr
);
...
...
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