linux-kernel - Re: [PATCH v2] staging: r8188eu: remove label at the end of a function

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <YQwtpmV88creZIuE@kroah.com>
Date:   Thu, 5 Aug 2021 20:27:50 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Martin Kaiser <martin@...ser.cx>
Cc:     Larry Finger <Larry.Finger@...inger.net>,
        Phillip Potter <phil@...lpotter.co.uk>,
        Dan Carpenter <dan.carpenter@...cle.com>,
        linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] staging: r8188eu: remove label at the end of a
 function

On Thu, Aug 05, 2021 at 07:55:16PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Aug 05, 2021 at 04:50:26PM +0200, Martin Kaiser wrote:
> > Compilation fails for me
> > 
> > drivers/staging/r8188eu/hal/rtl8188e_dm.c: In function ‘rtl8188e_HalDmWatchDog’:
> > drivers/staging/r8188eu/hal/rtl8188e_dm.c:182:1: error: label at end of compound statement
> >   182 | skip_dm:
> >       | ^~~~~~~
> > 
> > Remove the label at the end of the function. Replace the jump to this label
> > with a return statement.
> > 
> > Fixes: b398ff88aa36 ("staging: r8188eu: remove return from void functions")
> > Signed-off-by: Martin Kaiser <martin@...ser.cx>
> > ---
> > v2:
> >  - add Fixes tag
> > 
> >  drivers/staging/r8188eu/hal/rtl8188e_dm.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> > index b5f42127a751..72b3130eddd2 100644
> > --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> > +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> > @@ -145,7 +145,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
> >  	hw_init_completed = Adapter->hw_init_completed;
> >  
> >  	if (!hw_init_completed)
> > -		goto skip_dm;
> > +		return;
> >  
> >  	fw_cur_in_ps = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
> >  	rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&fw_ps_awake));
> > @@ -179,7 +179,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
> >  		ODM_CmnInfoUpdate(&hal_data->odmpriv, ODM_CMNINFO_LINK, bLinked);
> >  		ODM_DMWatchdog(&hal_data->odmpriv);
> >  	}
> > -skip_dm:
> > +
> >  	/*  Check GPIO to determine current RF on/off and Pbc status. */
> >  	/*  Check Hardware Radio ON/OFF or not */
> >  }
> > -- 
> > 2.20.1
> > 
> > 
> 
> How is this not showing up in my build tests?  Odd, let me figure that
> out...

odd, I think this is a gcc bug, the code above here is correct.  But
I'll take the fix for it...