From a05144649212ff3a04e7c6f46ba59365579f39ea Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 14 Jul 2015 12:51:49 +0200 Subject: [PATCH] linux-platform: correct the lifetime conditional Coverity detected that it was always-true: src/platform/nm-linux-platform.c:4035: dead_error_line: Execution cannot reach the expression "preferred != 0U" inside this statement: "if (lifetime != 0U || lifet...". (cherry picked from commit da612acc6a7d12115ece767d6d07e8ba54987d10) --- src/platform/nm-linux-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index b440542848..677f7add05 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -4032,8 +4032,8 @@ build_rtnl_addr (NMPlatform *platform, } _nl_rtnl_addr_set_prefixlen (rtnladdr, plen); - if ( lifetime != 0 || lifetime != NM_PLATFORM_LIFETIME_PERMANENT - || preferred != 0 || preferred != NM_PLATFORM_LIFETIME_PERMANENT) { + if ( (lifetime != 0 && lifetime != NM_PLATFORM_LIFETIME_PERMANENT) + || (preferred != 0 && preferred != NM_PLATFORM_LIFETIME_PERMANENT)) { /* note that here we set the relative timestamps (ticking from *now*). */ rtnl_addr_set_valid_lifetime (rtnladdr, lifetime); rtnl_addr_set_preferred_lifetime (rtnladdr, preferred);