linux-kernel - Re: linux-next: manual merge of the char-misc tree with the broadcom tree

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]

Date:   Fri, 25 Nov 2022 18:31:26 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Florian Fainelli <f.fainelli@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Yang Yingliang <yangyingliang@...wei.com>,
        Yuan Can <yuancan@...wei.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the broadcom
 tree

On Fri, Nov 25, 2022 at 11:25:42AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/firmware/raspberrypi.c
> 
> between commit:
> 
>   117bd98daca0 ("firmware: raspberrypi: Use dev_err_probe() to simplify code")
> 
> from the broadcom tree and commit:
> 
>   7b51161696e8 ("firmware: raspberrypi: fix possible memory leak in rpi_firmware_probe()")
> 
> from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/firmware/raspberrypi.c
> index ec07bf26e5eb,dba315f675bc..000000000000
> --- a/drivers/firmware/raspberrypi.c
> +++ b/drivers/firmware/raspberrypi.c
> @@@ -288,9 -268,13 +288,11 @@@ static int rpi_firmware_probe(struct pl
>   	fw->cl.tx_block = true;
>   
>   	fw->chan = mbox_request_channel(&fw->cl, 0);
> - 	if (IS_ERR(fw->chan))
> - 		return dev_err_probe(dev, PTR_ERR(fw->chan),
> - 				     "Failed to get mbox channel\n");
> + 	if (IS_ERR(fw->chan)) {
> + 		int ret = PTR_ERR(fw->chan);
>  -		if (ret != -EPROBE_DEFER)
>  -			dev_err(dev, "Failed to get mbox channel: %d\n", ret);
> + 		kfree(fw);
>  -		return ret;
> ++		return dev_err_probe(dev, ret, "Failed to get mbox channel\n");
> + 	}
>   
>   	init_completion(&fw->c);
>   	kref_init(&fw->consumers);

Looks good to me, thanks!

greg k-h