rpms/iproute
5
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Petr Sabata 2010-10-12 17:54:23 +02:00
parent b4de79a4f7
commit a3822ddc4b
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
iproute.spec
View File

@ -1,27 +1,28 @@
#%define date_version 20091106 #%define date_version 20091106
%define cbq_version v0.7.3 %define cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools Summary: Advanced IP routing and network device configuration tools
Name: iproute Name: iproute
Version: 2.6.35 Version: 2.6.35
Release: 6%{?dist} Release: 7%{?dist}
Group: Applications/System Group: Applications/System
##Source: iproute2-%{date_version}.tar.bz2 ##Source: iproute2-%{date_version}.tar.bz2
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
URL: http://linux-net.osdl.org/index.php/Iproute2 URL: http://linux-net.osdl.org/index.php/Iproute2
Patch0: man-pages.patch Patch0: man-pages.patch
Patch1: iproute2-2.6.29-kernel.patch Patch1: iproute2-2.6.29-kernel.patch
Patch2: iproute2-ss050901-opt_flags.patch Patch2: iproute2-ss050901-opt_flags.patch
Patch3: iproute2-2.6.25-segfault.patch Patch3: iproute2-2.6.25-segfault.patch
Patch4: iproute2-sharepath.patch Patch4: iproute2-sharepath.patch
Patch5: iproute2-2.6.31-tc_modules.patch Patch5: iproute2-2.6.31-tc_modules.patch
Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
Patch7: iproute2-example-cbq-service.patch Patch7: iproute2-example-cbq-service.patch
Patch8: iproute2-2.6.35-print-route.patch Patch8: iproute2-2.6.35-print-route.patch
Patch9: iproute2-print-route-u32.patch Patch9: iproute2-print-route-u32.patch
Patch10: iproute2-2.6.33-create-peer-veth-without-a-name.patch
License: GPLv2+ and Public Domain License: GPLv2+ and Public Domain
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tex(latex) tex(dvips) linuxdoc-tools BuildRequires: tex(latex) tex(dvips) linuxdoc-tools
BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison
# introduction new iptables (xtables) which broke ipt # introduction new iptables (xtables) which broke ipt
@ -53,6 +54,7 @@ The iproute documentation contains howtos and examples of settings.
%patch7 -p1 -b .fix_cbq %patch7 -p1 -b .fix_cbq
%patch8 -p1 -b .print-route %patch8 -p1 -b .print-route
%patch9 -p1 -b .print-route-u32 %patch9 -p1 -b .print-route-u32
%patch10 -p1 -b .peer-veth-without-name
%build %build
export LIBDIR=/%{_libdir} export LIBDIR=/%{_libdir}
@ -134,6 +136,9 @@ EOF
%doc RELNOTES %doc RELNOTES
%changelog %changelog
* Tue Oct 12 2010 Petr Sabata <psabata@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@redhat.com> - 2.6.35-6 * Mon Oct 11 2010 Petr Sabata <psabata@redhat.com> - 2.6.35-6
- Man-pages update, rhbz#641599 - Man-pages update, rhbz#641599

11
iproute2-2.6.33-create-peer-veth-without-a-name.patch Normal file
View File

@ -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;