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
37264b31
Commit
37264b31
authored
Mar 27, 2004
by
Ulisses Alonso Camaró
Committed by
James Morris
Mar 27, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AF_PACKET]: Fix packet_set_ring memleak and remove num frame limit.
parent
1d5b953d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
53 additions
and
36 deletions
+53
-36
net/packet/af_packet.c
net/packet/af_packet.c
+53
-36
No files found.
net/packet/af_packet.c
View file @
37264b31
...
...
@@ -34,6 +34,8 @@
* Alexey Kuznetsov : Untied from IPv4 stack.
* Cyrus Durgin : Fixed kerneld for kmod.
* Michal Ostrowski : Module initialization cleanup.
* Ulises Alonso : Frame number limit removal and
* packet_set_ring memory leak.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -168,30 +170,47 @@ static void packet_flush_mclist(struct sock *sk);
struct
packet_opt
{
struct
tpacket_stats
stats
;
#ifdef CONFIG_PACKET_MMAP
unsigned
long
*
pg_vec
;
unsigned
int
head
;
unsigned
int
frames_per_block
;
unsigned
int
frame_size
;
unsigned
int
frame_max
;
int
copy_thresh
;
#endif
struct
packet_type
prot_hook
;
spinlock_t
bind_lock
;
char
running
;
/* prot_hook is attached*/
int
ifindex
;
/* bound device */
unsigned
short
num
;
struct
tpacket_stats
stats
;
#ifdef CONFIG_PACKET_MULTICAST
struct
packet_mclist
*
mclist
;
#endif
#ifdef CONFIG_PACKET_MMAP
atomic_t
mapped
;
unsigned
long
*
pg_vec
;
unsigned
int
pg_vec_order
;
unsigned
int
pg_vec_order
;
unsigned
int
pg_vec_pages
;
unsigned
int
pg_vec_len
;
struct
tpacket_hdr
**
iovec
;
unsigned
int
frame_size
;
unsigned
int
iovmax
;
unsigned
int
head
;
int
copy_thresh
;
#endif
};
#ifdef CONFIG_PACKET_MMAP
static
inline
unsigned
long
packet_lookup_frame
(
struct
packet_opt
*
po
,
unsigned
int
position
)
{
unsigned
int
pg_vec_pos
,
frame_offset
;
unsigned
long
frame
;
pg_vec_pos
=
position
/
po
->
frames_per_block
;
frame_offset
=
position
%
po
->
frames_per_block
;
frame
=
(
unsigned
long
)
(
po
->
pg_vec
[
pg_vec_pos
]
+
(
frame_offset
*
po
->
frame_size
));
return
frame
;
}
#endif
#define pkt_sk(__sk) ((struct packet_opt *)(__sk)->sk_protinfo)
void
packet_sock_destruct
(
struct
sock
*
sk
)
...
...
@@ -586,11 +605,11 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
snaplen
=
skb
->
len
-
skb
->
data_len
;
spin_lock
(
&
sk
->
sk_receive_queue
.
lock
);
h
=
po
->
iovec
[
po
->
head
]
;
h
=
(
struct
tpacket_hdr
*
)
packet_lookup_frame
(
po
,
po
->
head
)
;
if
(
h
->
tp_status
)
goto
ring_is_full
;
po
->
head
=
po
->
head
!=
po
->
iov
max
?
po
->
head
+
1
:
0
;
po
->
head
=
po
->
head
!=
po
->
frame_
max
?
po
->
head
+
1
:
0
;
po
->
stats
.
tp_packets
++
;
if
(
copy_skb
)
{
status
|=
TP_STATUS_COPY
;
...
...
@@ -1485,10 +1504,13 @@ unsigned int packet_poll(struct file * file, struct socket *sock, poll_table *wa
unsigned
int
mask
=
datagram_poll
(
file
,
sock
,
wait
);
spin_lock_bh
(
&
sk
->
sk_receive_queue
.
lock
);
if
(
po
->
iovec
)
{
unsigned
last
=
po
->
head
?
po
->
head
-
1
:
po
->
iovmax
;
if
(
po
->
pg_vec
)
{
unsigned
last
=
po
->
head
?
po
->
head
-
1
:
po
->
frame_max
;
struct
tpacket_hdr
*
h
;
if
(
po
->
iovec
[
last
]
->
tp_status
)
h
=
(
struct
tpacket_hdr
*
)
packet_lookup_frame
(
po
,
last
);
if
(
h
->
tp_status
)
mask
|=
POLLIN
|
POLLRDNORM
;
}
spin_unlock_bh
(
&
sk
->
sk_receive_queue
.
lock
);
...
...
@@ -1548,16 +1570,18 @@ static void free_pg_vec(unsigned long *pg_vec, unsigned order, unsigned len)
static
int
packet_set_ring
(
struct
sock
*
sk
,
struct
tpacket_req
*
req
,
int
closing
)
{
unsigned
long
*
pg_vec
=
NULL
;
struct
tpacket_hdr
**
io_vec
=
NULL
;
struct
packet_opt
*
po
=
pkt_sk
(
sk
);
int
was_running
,
num
,
order
=
0
;
int
err
=
0
;
if
(
req
->
tp_block_nr
)
{
int
i
,
l
;
int
frames_per_block
;
/* Sanity tests and some calculations */
if
(
po
->
pg_vec
)
return
-
EBUSY
;
if
((
int
)
req
->
tp_block_size
<=
0
)
return
-
EINVAL
;
if
(
req
->
tp_block_size
&
(
PAGE_SIZE
-
1
))
...
...
@@ -1566,10 +1590,11 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
return
-
EINVAL
;
if
(
req
->
tp_frame_size
&
(
TPACKET_ALIGNMENT
-
1
))
return
-
EINVAL
;
frames_per_block
=
req
->
tp_block_size
/
req
->
tp_frame_size
;
if
(
frames_per_block
<=
0
)
po
->
frames_per_block
=
req
->
tp_block_size
/
req
->
tp_frame_size
;
if
(
po
->
frames_per_block
<=
0
)
return
-
EINVAL
;
if
(
frames_per_block
*
req
->
tp_block_nr
!=
req
->
tp_frame_nr
)
if
(
po
->
frames_per_block
*
req
->
tp_block_nr
!=
req
->
tp_frame_nr
)
return
-
EINVAL
;
/* OK! */
...
...
@@ -1596,20 +1621,16 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
}
/* Page vector is allocated */
/* Draw frames */
io_vec
=
kmalloc
(
req
->
tp_frame_nr
*
sizeof
(
struct
tpacket_hdr
*
),
GFP_KERNEL
);
if
(
io_vec
==
NULL
)
goto
out_free_pgvec
;
memset
(
io_vec
,
0
,
req
->
tp_frame_nr
*
sizeof
(
struct
tpacket_hdr
*
));
l
=
0
;
for
(
i
=
0
;
i
<
req
->
tp_block_nr
;
i
++
)
{
unsigned
long
ptr
=
pg_vec
[
i
];
struct
tpacket_hdr
*
header
;
int
k
;
for
(
k
=
0
;
k
<
frames_per_block
;
k
++
,
l
++
)
{
io_vec
[
l
]
=
(
struct
tpacket_hdr
*
)
ptr
;
io_vec
[
l
]
->
tp_status
=
TP_STATUS_KERNEL
;
for
(
k
=
0
;
k
<
po
->
frames_per_block
;
k
++
)
{
header
=
(
struct
tpacket_hdr
*
)
ptr
;
header
->
tp_status
=
TP_STATUS_KERNEL
;
ptr
+=
req
->
tp_frame_size
;
}
}
...
...
@@ -1642,8 +1663,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
spin_lock_bh
(
&
sk
->
sk_receive_queue
.
lock
);
pg_vec
=
XC
(
po
->
pg_vec
,
pg_vec
);
io_vec
=
XC
(
po
->
iovec
,
io_vec
);
po
->
iovmax
=
req
->
tp_frame_nr
-
1
;
po
->
frame_max
=
req
->
tp_frame_nr
-
1
;
po
->
head
=
0
;
po
->
frame_size
=
req
->
tp_frame_size
;
spin_unlock_bh
(
&
sk
->
sk_receive_queue
.
lock
);
...
...
@@ -1652,7 +1672,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
req
->
tp_block_nr
=
XC
(
po
->
pg_vec_len
,
req
->
tp_block_nr
);
po
->
pg_vec_pages
=
req
->
tp_block_size
/
PAGE_SIZE
;
po
->
prot_hook
.
func
=
po
->
io
vec
?
tpacket_rcv
:
packet_rcv
;
po
->
prot_hook
.
func
=
po
->
pg_
vec
?
tpacket_rcv
:
packet_rcv
;
skb_queue_purge
(
&
sk
->
sk_receive_queue
);
#undef XC
if
(
atomic_read
(
&
po
->
mapped
))
...
...
@@ -1670,9 +1690,6 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
release_sock
(
sk
);
if
(
io_vec
)
kfree
(
io_vec
);
out_free_pgvec:
if
(
pg_vec
)
free_pg_vec
(
pg_vec
,
order
,
req
->
tp_block_nr
);
...
...
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