Skip to contentSkip to conversation

selinux: avoid uninitialized variable warning

PATCH Superseded Arnd Bergmann 3 participants 5 messages Mar 22, 2019 SELinux security module

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selinux: avoid uninitialized variable warning

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.

---
 security/selinux/netlabel.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
security/selinux/netlabel.c +2 -4
index 186e727b737b..d0e549d4f486 100644
@@ -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;
 
Signature · 1 line
2.20.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · Arnd Bergmann

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
Quoted 7 lines

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.

Quoted 38 lines
---
 security/selinux/netlabel.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
security/selinux/netlabel.c +2 -4
index 186e727b737b..d0e549d4f486 100644
@@ -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;
 
Signature · 1 line
2.20.0
maintainer
#2 lore raw
In reply to Arnd Bergmann
Quoted 19 lines · Arnd Bergmann

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.

Quoted 8 lines

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.

---
 security/selinux/netlabel.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Hi Arnd,

Thanks for pointing this out and providing a fix. I think you're right in that the should be pretty harmless, but I also agree that we should fix it; some thoughts on the patch below ...

Quoted 15 lines
security/selinux/netlabel.c +0 -1
index 186e727b737b..d0e549d4f486 100644
@@ -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;

security/selinux/netlabel.c int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep, · line 318

Quoted 10 lines
security/selinux/netlabel.c +2 -2
                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

While we are hardening the code a bit, I'm thinking we should probably refactor this if-else a bit, some pseudo code for example:

    if (ip_hdr == 4) {
      rc = netlbl_conn_setattr();
  #if CONFIG_IPV6
    } else if (ip_hdr == 6) {
      rc = netlbl_conn_setattr();
  #endif
    } else {
      rc = -EAFNOSUPPORT;
    }

Thoughts?

Quoted 9 lines
security/selinux/netlabel.c +0 -2
        }
 
-       rc = netlbl_conn_setattr(ep->base.sk, addr, &secattr);
        if (rc == 0)
                sksec->nlbl_state = NLBL_LABELED;
 
--

2.20.0

Signature · 2 lines
paul moore
www.paul-moore.com
#3 lore raw
Quoted 47 lines · Paul Moore

On Fri, Mar 22, 2019 at 10:14 AM Arnd Bergmann <[email protected]> wrote:

Hi Arnd,

Thanks for pointing this out and providing a fix. I think you're right in that the should be pretty harmless, but I also agree that we should fix it; some thoughts on the patch below ...

Quoted 15 lines
security/selinux/netlabel.c +0 -1
index 186e727b737b..d0e549d4f486 100644
@@ -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;

security/selinux/netlabel.c int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep, · line 318

Quoted 10 lines
security/selinux/netlabel.c +2 -2
                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

While we are hardening the code a bit, I'm thinking we should probably refactor this if-else a bit, some pseudo code for example:

    if (ip_hdr == 4) {
      rc = netlbl_conn_setattr();
  #if CONFIG_IPV6
    } else if (ip_hdr == 6) {
      rc = netlbl_conn_setattr();
  #endif
    } else {
      rc = -EAFNOSUPPORT;
    }
Quoted 2 lines

Thoughts?

Seems fine. We could go a step further and use IS_ENABLED() as C code here to get rid of the two #ifdef checks as well, like

        if (ip_hdr(skb)->version == 4 ) {
                addr4.sin_family = AF_INET;
                addr4.sin_addr.s_addr = ip_hdr(skb)->saddr;
                rc = netlbl_conn_setattr(ep->base.sk, &addr4, &secattr);
        } else if (IS_ENABLED(CONFIG_IPV6) && ip_hdr(skb)->version == 6) {
                addr6.sin6_family = AF_INET6;
                addr6.sin6_addr = ipv6_hdr(skb)->saddr;
                rc = netlbl_conn_setattr(ep->base.sk, &addr6, &secattr);
        } else {
               rc = -EAFNOSUPPORT;
        }

Arnd

maintainer
#4 lore raw
Quoted 54 lines · Arnd Bergmann
Quoted 47 lines · Paul Moore

On Fri, Mar 22, 2019 at 10:14 AM Arnd Bergmann <[email protected]> wrote:

Hi Arnd,

Thanks for pointing this out and providing a fix. I think you're right in that the should be pretty harmless, but I also agree that we should fix it; some thoughts on the patch below ...

Quoted 15 lines
security/selinux/netlabel.c +0 -1
index 186e727b737b..d0e549d4f486 100644
@@ -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;

security/selinux/netlabel.c int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep, · line 318

Quoted 10 lines
security/selinux/netlabel.c +2 -2
                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

While we are hardening the code a bit, I'm thinking we should probably refactor this if-else a bit, some pseudo code for example:

    if (ip_hdr == 4) {
      rc = netlbl_conn_setattr();
  #if CONFIG_IPV6
    } else if (ip_hdr == 6) {
      rc = netlbl_conn_setattr();
  #endif
    } else {
      rc = -EAFNOSUPPORT;
    }
Quoted 2 lines

Thoughts?

Seems fine. We could go a step further and use IS_ENABLED() as C code here to get rid of the two #ifdef checks as well, like

Quoted 11 lines
        if (ip_hdr(skb)->version == 4 ) {
                addr4.sin_family = AF_INET;
                addr4.sin_addr.s_addr = ip_hdr(skb)->saddr;
                rc = netlbl_conn_setattr(ep->base.sk, &addr4, &secattr);
        } else if (IS_ENABLED(CONFIG_IPV6) && ip_hdr(skb)->version == 6) {
                addr6.sin6_family = AF_INET6;
                addr6.sin6_addr = ipv6_hdr(skb)->saddr;
                rc = netlbl_conn_setattr(ep->base.sk, &addr6, &secattr);
        } else {
               rc = -EAFNOSUPPORT;
        }

Looks good to me. Can you send a revised patch?

Signature · 2 lines
paul moore
www.paul-moore.com