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
nexedi
linux
Commits
4cf808e7
Commit
4cf808e7
authored
Oct 01, 2017
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kill dev_ifname32()
same story... Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
f92d4fc9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
21 deletions
+1
-21
net/socket.c
net/socket.c
+1
-21
No files found.
net/socket.c
View file @
4cf808e7
...
@@ -2666,25 +2666,6 @@ static int do_siocgstampns(struct net *net, struct socket *sock,
...
@@ -2666,25 +2666,6 @@ static int do_siocgstampns(struct net *net, struct socket *sock,
return
err
;
return
err
;
}
}
static
int
dev_ifname32
(
struct
net
*
net
,
struct
compat_ifreq
__user
*
uifr32
)
{
struct
ifreq
__user
*
uifr
;
int
err
;
uifr
=
compat_alloc_user_space
(
sizeof
(
struct
ifreq
));
if
(
copy_in_user
(
uifr
,
uifr32
,
sizeof
(
struct
compat_ifreq
)))
return
-
EFAULT
;
err
=
dev_ioctl
(
net
,
SIOCGIFNAME
,
uifr
);
if
(
err
)
return
err
;
if
(
copy_in_user
(
uifr32
,
uifr
,
sizeof
(
struct
compat_ifreq
)))
return
-
EFAULT
;
return
0
;
}
static
int
compat_dev_ifconf
(
struct
net
*
net
,
struct
compat_ifconf
__user
*
uifc32
)
static
int
compat_dev_ifconf
(
struct
net
*
net
,
struct
compat_ifconf
__user
*
uifc32
)
{
{
struct
compat_ifconf
ifc32
;
struct
compat_ifconf
ifc32
;
...
@@ -3034,8 +3015,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
...
@@ -3034,8 +3015,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case
SIOCSIFBR
:
case
SIOCSIFBR
:
case
SIOCGIFBR
:
case
SIOCGIFBR
:
return
old_bridge_ioctl
(
argp
);
return
old_bridge_ioctl
(
argp
);
case
SIOCGIFNAME
:
return
dev_ifname32
(
net
,
argp
);
case
SIOCGIFCONF
:
case
SIOCGIFCONF
:
return
compat_dev_ifconf
(
net
,
argp
);
return
compat_dev_ifconf
(
net
,
argp
);
case
SIOCETHTOOL
:
case
SIOCETHTOOL
:
...
@@ -3112,6 +3091,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
...
@@ -3112,6 +3091,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case
SIOCBONDRELEASE
:
case
SIOCBONDRELEASE
:
case
SIOCBONDSETHWADDR
:
case
SIOCBONDSETHWADDR
:
case
SIOCBONDCHANGEACTIVE
:
case
SIOCBONDCHANGEACTIVE
:
case
SIOCGIFNAME
:
return
sock_do_ioctl
(
net
,
sock
,
cmd
,
arg
);
return
sock_do_ioctl
(
net
,
sock
,
cmd
,
arg
);
}
}
...
...
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