linux-kernel - Re: [RFC v3 2/3] file: allow callers to free the old file descriptor after dup2

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 for Android: free password hash cracker in your pocket

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

Message-ID: <ZB08BPmuqEsw3bqU@ip-172-31-38-16.us-west-2.compute.internal>
Date:   Fri, 24 Mar 2023 05:58:28 +0000
From:   Alok Tiagi <aloktiagi@...il.com>
To:     Matthew Wilcox <willy@...radead.org>
Cc:     viro@...iv.linux.org.uk, brauner@...nel.org,
        David.Laight@...lab.com, linux-fsdevel@...r.kernel.org,
        linux-kernel@...r.kernel.org, keescook@...omium.org,
        hch@...radead.org, Tycho Andersen <tycho@...ho.pizza>,
        aloktiagi@...il.com
Subject: Re: [RFC v3 2/3] file: allow callers to free the old file descriptor
 after dup2

On Fri, Mar 24, 2023 at 05:28:06AM +0000, Matthew Wilcox wrote:
> On Fri, Mar 24, 2023 at 05:15:25AM +0000, aloktiagi wrote:
> > @@ -1119,8 +1119,12 @@ __releases(&files->file_lock)
> >  		__clear_close_on_exec(fd, fdt);
> >  	spin_unlock(&files->file_lock);
> >  
> > -	if (tofree)
> > -		filp_close(tofree, files);
> > +	if (fdfile) {
> > +		*fdfile = tofree;
> > +	} else {
> > +		if (tofree)
> > +			filp_close(tofree, files);
> > +	}
> 
> Why not:
> 
> 	if (fdfile)
> 		 *fdfile = tofree;
> 	else if (tofree)
> 		filp_close(tofree, files);
> 
> Shorter and makes the parallel structure more obvious.
> 

Agreed. Thank you for suggesting that. I'll fix this in v4.