/[linux-patches]/genpatches-2.6/trunk/2.6.16/1017_linux-2.6.16.18.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.16/1017_linux-2.6.16.18.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 482 - (show annotations) (download) (as text)
Fri Jun 2 11:13:51 2006 UTC (14 years, 6 months ago) by dsd
File MIME type: text/x-diff
File size: 883 byte(s)
remove version hunks, fix to apply
1 diff --git a/net/ipv4/netfilter/ip_nat_snmp_basic.c b/net/ipv4/netfilter/ip_nat_snmp_basic.c
2 index 4f95d47..df57e7a 100644
3 --- a/net/ipv4/netfilter/ip_nat_snmp_basic.c
4 +++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c
5 @@ -1000,12 +1000,12 @@ static unsigned char snmp_trap_decode(st
6
7 return 1;
8
9 +err_addr_free:
10 + kfree((unsigned long *)trap->ip_address);
11 +
12 err_id_free:
13 kfree(trap->id);
14
15 -err_addr_free:
16 - kfree((unsigned long *)trap->ip_address);
17 -
18 return 0;
19 }
20
21 @@ -1123,11 +1123,10 @@ static int snmp_parse_mangle(unsigned ch
22 struct snmp_v1_trap trap;
23 unsigned char ret = snmp_trap_decode(&ctx, &trap, map, check);
24
25 - /* Discard trap allocations regardless */
26 - kfree(trap.id);
27 - kfree((unsigned long *)trap.ip_address);
28 -
29 - if (!ret)
30 + if (ret) {
31 + kfree(trap.id);
32 + kfree((unsigned long *)trap.ip_address);
33 + } else
34 return ret;
35
36 } else {

  ViewVC Help
Powered by ViewVC 1.1.20