Attachment 835274 Details for Bug 1040367 – Correct patch proposed to upstream

[patch] Correct patch proposed to upstream

0001-Do-not-listen-if-rtnl_send-fails-in-ip-link-iplink_h.patch (text/plain), 1.21 KB, created by Petr Pisar on 2013-12-11 13:04:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2013-12-11 13:04:58 UTC

Size: 1.21 KB

patch

obsolete

>From 1e6c01eb350fcb97764142b63ff518d4a5d37480 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Wed, 11 Dec 2013 13:08:14 +0100
>Subject: [PATCH] Do not listen if rtnl_send() fails in ip link
> iplink_have_newlink() test
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If rtnl_send() fails in iplink_have_newlink() test, listening for
>response will result in indefinite hang. This can be demonstrated by
>"ip link show" while SELinux preventing from sending the RTM_NEWLINK
>over netlink.
>
>This patch checks for the return value as is done at all other
>rtnl_send() calls.
>
>Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>---
> ip/iplink.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/ip/iplink.c b/ip/iplink.c
>index 58b6c20..f7d9e17 100644
>--- a/ip/iplink.c
>+++ b/ip/iplink.c
>@@ -178,8 +178,8 @@ static int iplink_have_newlink(void)
> 		req.n.nlmsg_type = RTM_NEWLINK;
> 		req.i.ifi_family = AF_UNSPEC;
> 
>-		rtnl_send(&rth, &req.n, req.n.nlmsg_len);
>-		rtnl_listen(&rth, accept_msg, NULL);
>+		if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) >= 0)
>+			rtnl_listen(&rth, accept_msg, NULL);
> 	}
> 	return have_rtnl_newlink;
> }
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1040367: 835274