linux-kernel - Re: [PATCH 07/15] mm/swap: remove unneeded p != NULL check in __swap

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]

Date:   Wed, 18 May 2022 11:40:16 +0200
From:   Oscar Salvador <osalvador@...e.de>
To:     Miaohe Lin <linmiaohe@...wei.com>
Cc:     akpm@...ux-foundation.org, willy@...radead.org, vbabka@...e.cz,
        dhowells@...hat.com, neilb@...e.de, apopple@...dia.com,
        david@...hat.com, surenb@...gle.com, peterx@...hat.com,
        naoya.horiguchi@....com, linux-mm@...ck.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH 07/15] mm/swap: remove unneeded p != NULL check in
 __swap_duplicate

On Mon, May 09, 2022 at 09:14:08PM +0800, Miaohe Lin wrote:
> If p is NULL, __swap_duplicate will already return -EINVAL. So if we
> reach here, p must be non-NULL.
> 
> Signed-off-by: Miaohe Lin <linmiaohe@...wei.com>

Reviewed-by: Oscar Salvador <osalvador@...e.de>

> ---
>  mm/swapfile.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index d4b81ca887c0..7b4c99ca2aea 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -3336,8 +3336,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
>  
>  unlock_out:
>  	unlock_cluster_or_swap_info(p, ci);
> -	if (p)
> -		put_swap_device(p);
> +	put_swap_device(p);
>  	return err;
>  }
>  
> -- 
> 2.23.0
> 
> 

-- 
Oscar Salvador
SUSE Labs