IA32 (2.6.8.1 - 2004-08-23.21.30) - 3 New warnings (gcc 3.2.2)

IA32 (2.6.8.1 - 2004-08-23.21.30) - 3 New warnings (gcc 3.2.2)

[John Cherry]

drivers/scsi/BusLogic.c:2976: warning: `BusLogic_AbortCommand' defined but not used
security/selinux/hooks.c:2825: warning: `ret' might be used uninitialized in this function
security/selinux/hooks.c:2886: warning: `ret' might be used uninitialized in this function

2.6.9-rc1: selinux/hooks.c: functions returning unassigned variables

[Adrian Bunk]

On Tue, Aug 24, 2004 at 08:19:28AM -0700, John Cherry wrote:
>...
> security/selinux/hooks.c:2825: warning: `ret' might be used uninitialized in this function
> security/selinux/hooks.c:2886: warning: `ret' might be used uninitialized in this function


This was
  [NET]: Add skb_header_pointer, and use it where possible.


@Dave:
In both functions ret is returned, but line that assigned a value to ret 
was removed.

*shrug*


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: 2.6.9-rc1: selinux/hooks.c: functions returning unassigned variables

[Stephen Smalley]

On Tue, 2004-08-24 at 11:33, Adrian Bunk wrote:
> On Tue, Aug 24, 2004 at 08:19:28AM -0700, John Cherry wrote:
> >...
> > security/selinux/hooks.c:2825: warning: `ret' might be used uninitialized in this function
> > security/selinux/hooks.c:2886: warning: `ret' might be used uninitialized in this function
> 
> 
> This was
>   [NET]: Add skb_header_pointer, and use it where possible.
> 
> 
> @Dave:
> In both functions ret is returned, but line that assigned a value to ret 
> was removed.

===== security/selinux/hooks.c 1.54 vs edited =====
--- 1.54/security/selinux/hooks.c	2004-08-18 20:14:54 -04:00
+++ edited/security/selinux/hooks.c	2004-08-24 08:43:51 -04:00
@@ -2822,7 +2822,7 @@
 /* Returns error only if unable to parse addresses */
 static int selinux_parse_skb_ipv4(struct sk_buff *skb, struct avc_audit_data *ad)
 {
-	int offset, ihlen, ret;
+	int offset, ihlen, ret = -EINVAL;
 	struct iphdr _iph, *ih;
 
 	offset = skb->nh.raw - skb->data;
@@ -2836,6 +2836,7 @@
 
 	ad->u.net.v4info.saddr = ih->saddr;
 	ad->u.net.v4info.daddr = ih->daddr;
+	ret = 0;
 
 	switch (ih->protocol) {
         case IPPROTO_TCP: {
@@ -2883,7 +2884,7 @@
 static int selinux_parse_skb_ipv6(struct sk_buff *skb, struct avc_audit_data *ad)
 {
 	u8 nexthdr;
-	int ret, offset;
+	int ret = -EINVAL, offset;
 	struct ipv6hdr _ipv6h, *ip6;
 
 	offset = skb->nh.raw - skb->data;
@@ -2893,6 +2894,7 @@
 
 	ipv6_addr_copy(&ad->u.net.v6info.saddr, &ip6->saddr);
 	ipv6_addr_copy(&ad->u.net.v6info.daddr, &ip6->daddr);
+	ret = 0;
 
 	nexthdr = ip6->nexthdr;
 	offset += sizeof(_ipv6h);

-- 
Stephen Smalley <sds@epoch.ncsc.mil>
National Security Agency

Re: 2.6.9-rc1: selinux/hooks.c: functions returning unassigned variables

[David S. Miller]

On Tue, 24 Aug 2004 11:41:45 -0400
Stephen Smalley <sds@epoch.ncsc.mil> wrote:

> On Tue, 2004-08-24 at 11:33, Adrian Bunk wrote:
> > On Tue, Aug 24, 2004 at 08:19:28AM -0700, John Cherry wrote:
> > >...
> > > security/selinux/hooks.c:2825: warning: `ret' might be used uninitialized in this function
> > > security/selinux/hooks.c:2886: warning: `ret' might be used uninitialized in this function
> > 
> > 
> > This was
> >   [NET]: Add skb_header_pointer, and use it where possible.
> > 
> > 
> > @Dave:
> > In both functions ret is returned, but line that assigned a value to ret 
> > was removed.

Good catch.  Patch applied, thanks Stephen.