adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

af_key: Free dumping state on socket close

Browse source 
Fix a xfrm_{state,policy}_walk leak if pfkey socket is closed while
dumping is on-going.

Signed-off-by: Timo Teras <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Timo Teras 2008-10-01 05:17:54 -07:00 committed by David S. Miller
parent 5dc121e9a7
commit 0523820482
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
net/key/af_key.c
View file

@ -73,22 +73,18 @@ static int pfkey_can_dump(struct sock *sk)
return 0; return 0;
} }
static int pfkey_do_dump(struct pfkey_sock *pfk) static void pfkey_terminate_dump(struct pfkey_sock *pfk)
{ {
int rc; if (pfk->dump.dump) {
rc = pfk->dump.dump(pfk);
if (rc == -ENOBUFS)
return 0;
pfk->dump.done(pfk); pfk->dump.done(pfk);
pfk->dump.dump = NULL; pfk->dump.dump = NULL;
pfk->dump.done = NULL; pfk->dump.done = NULL;
return rc; }
} }
static void pfkey_sock_destruct(struct sock *sk) static void pfkey_sock_destruct(struct sock *sk)
{ {
pfkey_terminate_dump(pfkey_sk(sk));
skb_queue_purge(&sk->sk_receive_queue); skb_queue_purge(&sk->sk_receive_queue);
if (!sock_flag(sk, SOCK_DEAD)) { if (!sock_flag(sk, SOCK_DEAD)) {
@ -310,6 +306,18 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation,
return err; return err;
} }
static int pfkey_do_dump(struct pfkey_sock *pfk)
{
int rc;
rc = pfk->dump.dump(pfk);
if (rc == -ENOBUFS)
return 0;
pfkey_terminate_dump(pfk);
return rc;
}
static inline void pfkey_hdr_dup(struct sadb_msg *new, struct sadb_msg *orig) static inline void pfkey_hdr_dup(struct sadb_msg *new, struct sadb_msg *orig)
{ {
*new = *orig; *new = *orig;