From patchwork Fri Mar 22 14:14:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 160903 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp864979jan; Fri, 22 Mar 2019 07:14:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqzakXH/tvSPxOH35pWmG/dliFt/gd4DZMszWKmtbKOofYjayR3rgM5p+e/aV7AYaXYLeccd X-Received: by 2002:a17:902:864b:: with SMTP id y11mr911243plt.1.1553264080319; Fri, 22 Mar 2019 07:14:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553264080; cv=none; d=google.com; s=arc-20160816; b=hBZo/fR6rwC8ek27i3veWm8Jx2ZEJQYigtH8cUljvKjlvxNqdNJyf+wZbxxCm6dVqu SregBRncIijOFe3IdI3Fcfjb1A73yr/0P9aJ4hME49Ury0tRvZK1/1yGO2CqzPxWAf49 EcHnn1XqkkTBYpHATBEP19Yq+cw30eUICyJmC6un6XLqdthgjiHV+VyjIgihzAvRo7ix hnS5Sl3Uta2PvblZSx3+Xd25uKL6baeCdk/Q5gWlugMcG3yQ+JC373bdrzNr7LIY/vcB cNjBmCSorlNihxpfU7E12ie8TgRpwgrN6350kMJEKbu+DiW8/WYzOq6K5uhhLdo2Ki0r fPQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=o2CqUZU1FyDuVPAcX0GyUdpYiJ80RnvrDsbhCpLMxYc=; b=ZDDbOxYWnEVfZjrosXwjdqiYRL7Del5UxKAJW8OM+klqUfbDn4OovdQ0lD/USQdMTM Hj1yD8XL/dmyK3oZM9QGsgSnFnG/jmXeEJ2tQeNGCPj+gPQkgk5HZfidHc2CuohFe72Y /rzRPaC5rYrmFMt6bnVpQQYhjDI03hRxgU44zmCPYcZGrVSEHqBL7uw4ypuly/qovXEA TF/2wdPbmQlSh1KmnsIYVO5CJnhT6FQ2IhuB9y3pJeQ6fKnZDsFt9uBy4DXS8i9S4/+V 0x5wKmPB4YrBJ9/5ZKwzWO8rolcUSx/8wCE1TltBBQXjVWCfbjUXEFLH3l5UeuZvEsud 5e8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d130si6699535pgc.197.2019.03.22.07.14.40; Fri, 22 Mar 2019 07:14:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728035AbfCVOOi (ORCPT + 31 others); Fri, 22 Mar 2019 10:14:38 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:42603 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727602AbfCVOOi (ORCPT ); Fri, 22 Mar 2019 10:14:38 -0400 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1N33V5-1gzeo127WX-013LMl; Fri, 22 Mar 2019 15:14:16 +0100 From: Arnd Bergmann To: Paul Moore , Stephen Smalley , Eric Paris Cc: clang-built-linux@googlegroups.com, Nick Desaulniers , Nathan Chancellor , Arnd Bergmann , selinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] selinux: avoid uninitialized variable warning Date: Fri, 22 Mar 2019 15:14:10 +0100 Message-Id: <20190322141414.496017-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:w5V6K7pdZn5HEIo8LT9QcLMEh4jms0YhMHN7c3bwHTP5qxKGPLN q0MoxjZIjCcvUgedvnGJmvU1IN9AGQDT3QM/B/0iyu0ctg1pn6qysIHcvi/EFyQ56GRQmuH zIy+n2vtRi0rjqQxmA0YRsPizw9ZY72fYDVqDF1nF0K2Y8vkKmAvNpzW4yCA+DekQiapLAL J6y5ZuUKwmxkNXiGWUhoA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:W6BJY4dw72c=:54tRuohkmB2xo+1BD2tbGs 460fwgnCO7QsjOMSC/6XJE2dmDYWv/O3+zeurS2OEYAwHURPOF5WWJ6ZbkJU5ArINMMsy3g+q lQnGn7cItz5/YIDDQMSlbTdR8B9bMvFopMne1XqBz1bBRDyzsD6JuwL8NJTHWJjPCwqPv9/Ir j8u6VjKh+oVH+IpfKZL7TEvOVztdJqcXti43Rd3/g+Yk0/o9jZpg9aAdpDAFoed9KdC9d737q D5T8xWKSa9QtLu3WesjtumA5hPrGmitw4bsR4wf+OpdPIFMqxLqzFQyPJvozsgM9NGCQV/8YV JIMIA9a7lUYZ3byEN6Z2DfnvIevobprai0FvbhfwilNYerltuM/iXfF7xTuzXZ9SVoLEyTE9x /efvji4v1fHO6g4sQ0BaKHTxKTVUhyUOmCOBj/djlEFKTHOnEaUWKbVc0nmOcmQUfDv4Dqz8q BrSBFid93LJkvoEIAf9GbMXCnMMvVP9qsJRPAO2S5BkU5WcKsOKvdUALXfaWCNnugOhSKhwLI USAsprcbcexuvCWWOZKS2QqEd83ZjHVHVvuTzk117jXU2ksagTh0Ymr6Nr2o2l3CW/U9sKk1I QdMqeV+disgdeMeXH+DC4D5Emdn/CcJZsyxQifiMjiTn6G71+FiQcK6I3TA69AErolNGhes1k pCpAiBSbBudyNXOwB3HEGEGUrJyMcsLMXJ/OIXrtAPu3PqJWOwTqf0Dej394j4/qbWX9ajQgw EJZ8QB/dxgJyivI70rG5LB8QasEIxeIXOxZa1Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clang correctly points out a code path that would lead to an uninitialized variable use: security/selinux/netlabel.c:310:6: error: variable 'addr' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (ip_hdr(skb)->version == 4) { ^~~~~~~~~~~~~~~~~~~~~~~~~ security/selinux/netlabel.c:322:40: note: uninitialized use occurs here rc = netlbl_conn_setattr(ep->base.sk, addr, &secattr); ^~~~ security/selinux/netlabel.c:310:2: note: remove the 'if' if its condition is always true if (ip_hdr(skb)->version == 4) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ security/selinux/netlabel.c:291:23: note: initialize the variable 'addr' to silence this warning struct sockaddr *addr; ^ = NULL 1 error generated. This is probably harmless since we should not see ipv6 packets of CONFIG_IPV6 is disabled, but it's better to rearrange the code so this cannot happen. Signed-off-by: Arnd Bergmann --- security/selinux/netlabel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.20.0 Reviewed-by: Nathan Chancellor diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index 186e727b737b..d0e549d4f486 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c @@ -288,7 +288,6 @@ int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep, int rc; struct netlbl_lsm_secattr secattr; struct sk_security_struct *sksec = ep->base.sk->sk_security; - struct sockaddr *addr; struct sockaddr_in addr4; #if IS_ENABLED(CONFIG_IPV6) struct sockaddr_in6 addr6; @@ -310,16 +309,15 @@ int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep, if (ip_hdr(skb)->version == 4) { addr4.sin_family = AF_INET; addr4.sin_addr.s_addr = ip_hdr(skb)->saddr; - addr = (struct sockaddr *)&addr4; + rc = netlbl_conn_setattr(ep->base.sk, (void*)&addr4, &secattr); #if IS_ENABLED(CONFIG_IPV6) } else { addr6.sin6_family = AF_INET6; addr6.sin6_addr = ipv6_hdr(skb)->saddr; - addr = (struct sockaddr *)&addr6; + rc = netlbl_conn_setattr(ep->base.sk, (void*)&addr6, &secattr); #endif } - rc = netlbl_conn_setattr(ep->base.sk, addr, &secattr); if (rc == 0) sksec->nlbl_state = NLBL_LABELED;