[iproute/f13/master] Do not segfault when creating a peer veth link without a name

[Petr Sabata]

commit adaa009056f8a9000c5acc2d085d9899ad59def1
Author: Petr Sabata <psabata at redhat.com>
Date:   Tue Oct 12 17:30:57 2010 +0200

    Do not segfault when creating a peer veth link without a name

 iproute.spec                                       |    7 ++++++-
 ...e2-2.6.33-create-peer-veth-without-a-name.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/iproute.spec b/iproute.spec
index d98b59d..e10924e 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.33
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/System
 ##Source: iproute2-%{date_version}.tar.bz2
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
@@ -18,6 +18,7 @@ Patch5: iproute2-2.6.31-tc_modules.patch
 Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 Patch7: iproute2-example-cbq-service.patch
 Patch8: iproute2-print-route-u32.patch
+Patch9: iproute2-2.6.33-create-peer-veth-without-a-name.patch
 
 License: GPLv2+ and Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,7 @@ The iproute documentation contains howtos and examples of settings.
 %patch6 -p1 -b .ipproto
 %patch7 -p1 -b .fix_cbq
 %patch8 -p1 -b .print-route-u32
+%patch9 -p1 -b .peer-veth-without-name
 
 %build
 export LIBDIR=/%{_libdir}
@@ -130,6 +132,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Tue Oct 12 2010 Petr Sabata <psabata at redhat.com> - 2.6.33-7
+- Do not segfault if peer name is omitted when creating a peer veth link, rhbz#642322
+
 * Mon Oct 11 2010 Petr Sabata <psabata at redhat.com> - 2.6.33-6
 - man-pages.patch, ss update, changed 0xad to 0x2d
 
diff --git a/iproute2-2.6.33-create-peer-veth-without-a-name.patch b/iproute2-2.6.33-create-peer-veth-without-a-name.patch
new file mode 100644
index 0000000..1b64b30
--- /dev/null
+++ b/iproute2-2.6.33-create-peer-veth-without-a-name.patch
@@ -0,0 +1,11 @@
+--- iproute2-2.6.33/ip/link_veth.c	2010-02-25 04:56:50.000000000 +0100
++++ iproute2-2.6.33/ip/link_veth.c.new	2010-10-12 17:25:01.159138225 +0200
+@@ -27,7 +27,7 @@
+ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			  struct nlmsghdr *hdr)
+ {
+-	char *name, *type, *link, *dev;
++	char *name = NULL, *type = NULL, *link = NULL, *dev = NULL;
+ 	int err, len;
+ 	struct rtattr * data;
+