linux-kernel - RE: [PATCH] ipmi: fix ipmb

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, 22 Nov 2019 19:43:06 +0000
From:   Asmaa Mnebhi <Asmaa@...lanox.com>
To:     "minyard@....org" <minyard@....org>,
        Luc Van Oostenryck <luc.vanoostenryck@...il.com>
CC:     "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "openipmi-developer@...ts.sourceforge.net" 
        <openipmi-developer@...ts.sourceforge.net>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: RE: [PATCH] ipmi: fix ipmb_poll()'s return type

Reviewed-by: Asmaa Mnebhi <asmaa@...lanox.com>

-----Original Message-----
From: Corey Minyard <tcminyard@...il.com> On Behalf Of Corey Minyard
Sent: Friday, November 22, 2019 2:41 PM
To: Luc Van Oostenryck <luc.vanoostenryck@...il.com>
Cc: linux-kernel@...r.kernel.org; openipmi-developer@...ts.sourceforge.net; Greg Kroah-Hartman <gregkh@...uxfoundation.org>; Asmaa Mnebhi <Asmaa@...lanox.com>
Subject: Re: [PATCH] ipmi: fix ipmb_poll()'s return type

On Wed, Nov 20, 2019 at 01:07:41AM +0100, Luc Van Oostenryck wrote:
> ipmb_poll() is defined as returning 'unsigned int' but the .poll 
> method is declared as returning '__poll_t', a bitwise type.
> 
> Fix this by using the proper return type and using the EPOLL constants 
> instead of the POLL ones, as required for __poll_t.

Copying the author for comment, but this looks ok with me.

-corey

> 
> CC: Corey Minyard <minyard@....org>
> CC: openipmi-developer@...ts.sourceforge.net
> CC: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@...il.com>
> ---
>  drivers/char/ipmi/ipmb_dev_int.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/char/ipmi/ipmb_dev_int.c 
> b/drivers/char/ipmi/ipmb_dev_int.c
> index 285e0b8f9a97..2ea51147c3e8 100644
> --- a/drivers/char/ipmi/ipmb_dev_int.c
> +++ b/drivers/char/ipmi/ipmb_dev_int.c
> @@ -154,16 +154,16 @@ static ssize_t ipmb_write(struct file *file, const char __user *buf,
>  	return ret ? : count;
>  }
>  
> -static unsigned int ipmb_poll(struct file *file, poll_table *wait)
> +static __poll_t ipmb_poll(struct file *file, poll_table *wait)
>  {
>  	struct ipmb_dev *ipmb_dev = to_ipmb_dev(file);
> -	unsigned int mask = POLLOUT;
> +	__poll_t mask = EPOLLOUT;
>  
>  	mutex_lock(&ipmb_dev->file_mutex);
>  	poll_wait(file, &ipmb_dev->wait_queue, wait);
>  
>  	if (atomic_read(&ipmb_dev->request_queue_len))
> -		mask |= POLLIN;
> +		mask |= EPOLLIN;
>  	mutex_unlock(&ipmb_dev->file_mutex);
>  
>  	return mask;
> --
> 2.24.0
>