netdev - Re: [PATCH 2/3] net: convert BUG_TRAP to generic WARN

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: <Pine.LNX.4.64.0807260003200.11441@wrl-59.cs.helsinki.fi>
Date:	Sat, 26 Jul 2008 00:19:42 +0300 (EEST)
From:	"Ilpo Järvinen" <ilpo.jarvinen@...sinki.fi>
To:	David Miller <davem@...emloft.net>
cc:	Herbert Xu <herbert@...dor.apana.org.au>,
	Netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH 2/3] net: convert BUG_TRAP to generic WARN_ON

On Fri, 25 Jul 2008, David Miller wrote:

> From: Herbert Xu <herbert@...dor.apana.org.au>
> Date: Fri, 25 Jul 2008 23:34:34 +0800
> 
> > Ilpo J??rvinen <ilpo.jarvinen@...sinki.fi> wrote:
> > >
> > > diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
> > > index a75807b..ee1bbf9 100644
> > > --- a/net/ipv4/ipcomp.c
> > > +++ b/net/ipv4/ipcomp.c
> > > @@ -293,7 +293,7 @@ static void ipcomp_free_tfms(struct crypto_comp **tfms)
> > >                        break;
> > >        }
> > > 
> > > -       BUG_TRAP(pos);
> > > +       WARN_ON(!pos);
> > 
> > Sorry I've just moved this to net/xfrm/xfrm_ipcomp.c.  BTW,
> > please also remove rtnetlink.h from ipcomp.c since that's only
> > included for this macro.
> 
> This is my fault, I didn't push before going to bed last night.
> Otherwise Ilpo would have seen this sooner.
> 
> I've just taken care of this.

Thanks! I thought Herbert patch was related but since I couldn't find it 
in your tree I assumed that you volunteer to fix it like you usually do 
with the other people too who are hit by a merge conflicts due to some 
very recent merges. Afterwards I realized that I could have just
included his patch locally but honestly it was after I made and sent
that one out... :-)

I anyway intend to drop as many linux/rtnetlink.h includes as possible in 
the modified files in a later series but since it requires more care than 
the plain conversion it takes some more time to validate, and extra 
includes won't hurt that much anyway.

-- 
 i.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html