linux-kernel - Re: [PATCH] SCTP: fix compile warning building without CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20080324.004742.24756426.davem@davemloft.net>
Date:	Mon, 24 Mar 2008 00:47:42 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	lizf@...fujitsu.com
Cc:	vladislav.yasevich@...com, sri@...ibm.com,
	lksctp-developers@...ts.sourceforge.net,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] SCTP: fix compile warning building without CONFIG_IPV6

From: Li Zefan <lizf@...fujitsu.com>
Date: Mon, 24 Mar 2008 15:01:06 +0800

> David Miller wrote:
> > From: Li Zefan <lizf@...fujitsu.com>
> > Date: Mon, 24 Mar 2008 14:11:20 +0800
> > 
> >> include/net/sctp/sctp.h: In function ‘sctp_v6_pf_init’:
> >> include/net/sctp/sctp.h:392: warning: 'return' with a value, in function returning void
> >>
> >> This warning repeats several times.
> >>
> >> Signed-off-by: Li Zefan <lizf@...fujitsu.com>
> > 
> > Fixed in net-2.6 for several days already.
> 
> I looked into the git-log of net-2.6-26 and didn't find the fix.

The net-2.6 tree, not net-2.6.26, holds bug fixes and the change in
question was checked in on Friday.

commit 1233823b0847190976d69a86d7bb1287992ba2c7
Author: David S. Miller <davem@...emloft.net>
Date:   Fri Mar 21 15:40:47 2008 -0700

    [SCTP]: Fix build warnings with IPV6 disabled.
    
    Introduced by 270637abff0cdf848b910b9f96ad342e1da61c66
    ("[SCTP]: Fix a race between module load and protosw access")
    
    Reported by Gabriel C:
    
    In file included from net/sctp/sm_statetable.c:50:
    include/net/sctp/sctp.h: In function 'sctp_v6_pf_init':
    include/net/sctp/sctp.h:392: warning: 'return' with a value, in function returning void
    In file included from net/sctp/sm_statefuns.c:62:
    include/net/sctp/sctp.h: In function 'sctp_v6_pf_init':
    include/net/sctp/sctp.h:392: warning: 'return' with a value, in function returning void
     ...
    
    Signed-off-by: David S. Miller <davem@...emloft.net>

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 57ed3e3..ea80673 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -389,7 +389,7 @@ void sctp_v6_del_protocol(void);
 
 #else /* #ifdef defined(CONFIG_IPV6) */
 
-static inline void sctp_v6_pf_init(void) { return 0; }
+static inline void sctp_v6_pf_init(void) { return; }
 static inline void sctp_v6_pf_exit(void) { return; }
 static inline int sctp_v6_protosw_init(void) { return 0; }
 static inline void sctp_v6_protosw_exit(void) { return; }