Change the patch a little.
This commit is contained in:
parent
000b2439f1
commit
280a6374e9
@ -115,7 +115,7 @@ EOF
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 3 2008 Marcela Maslanova <mmaslano@redhat.com> - 2.6.25-3
|
* Thu Jul 3 2008 Marcela Maslanova <mmaslano@redhat.com> - 2.6.25-3
|
||||||
- 49933 fix segfault after non-existent combination of commands
|
- 449933 fix segfault after non-existent combination of commands
|
||||||
|
|
||||||
* Wed May 14 2008 Marcela Maslanova <mmaslano@redhat.com> - 2.6.25-2
|
* Wed May 14 2008 Marcela Maslanova <mmaslano@redhat.com> - 2.6.25-2
|
||||||
- allow replay setting, solve also 444724
|
- allow replay setting, solve also 444724
|
||||||
|
@ -1,13 +1,15 @@
|
|||||||
diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c
|
diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c
|
||||||
--- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava 2008-07-03 16:00:13.000000000 +0200
|
--- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg 2008-07-04 13:22:13.000000000 +0200
|
||||||
+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-03 16:08:43.000000000 +0200
|
+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-04 13:30:51.000000000 +0200
|
||||||
@@ -162,7 +162,8 @@ static int xfrm_algo_parse(struct xfrm_a
|
@@ -162,8 +162,9 @@ static int xfrm_algo_parse(struct xfrm_a
|
||||||
if (len > 0) {
|
if (len > 0) {
|
||||||
if (len > max)
|
if (len > max)
|
||||||
invarg("\"ALGOKEY\" makes buffer overflow\n", key);
|
invarg("\"ALGOKEY\" makes buffer overflow\n", key);
|
||||||
-
|
-
|
||||||
|
- strncpy(buf, key, len);
|
||||||
+ else
|
+ else
|
||||||
+ invarg("\"ALGOKEY\" is invalid", key);
|
+ invarg("\"ALGOKEY\" is invalid", key);
|
||||||
strncpy(buf, key, len);
|
+ /* strncpy(buf, key, len); */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user