From: Prashanth K <quic_prashk@quicinc.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Gustavo A . R . Silva" <gustavoars@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
John Keeping <john@metanate.com>,
Linyu Yuan <quic_linyyuan@quicinc.com>,
Pratham Pratap <quic_ppratap@quicinc.com>,
Vincent Pelletier <plr.vincent@gmail.com>,
Dan Carpenter <error27@gmail.com>,
Udipto Goswami <quic_ugoswami@quicinc.com>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"# 5 . 15" <stable@vger.kernel.org>
Subject: Re: usb: f_fs: Fix CFI failure in ki_complete
Date: Wed, 14 Dec 2022 18:38:17 +0530 [thread overview]
Message-ID: <214c4b8f-b86b-3e1f-d34b-ccfa756f3136@quicinc.com> (raw)
In-Reply-To: <Y5cuCMhFIaKraUyi@kroah.com>
On 12-12-22 07:05 pm, Greg Kroah-Hartman wrote:
> On Mon, Dec 12, 2022 at 06:54:24PM +0530, Prashanth K wrote:
>> Function pointer ki_complete() expects 'long' as its second
>> argument, but we pass integer from ffs_user_copy_worker. This
>> might cause a CFI failure, as ki_complete is an indirect call
>> with mismatched prototype. Fix this by typecasting the second
>> argument to long.
>
> "might"? Does it or not? If it does, why hasn't this been reported
> before?
Sorry for the confusion in commit text, We caught a CFI (Control Flow
Integrity) failure internally on 5.15, hence pushed this patch. But
later I came to know that CFI was implemented on 5.4 kernel for Android.
Will push the same on ACK and share the related details there.
Thanks.
>
>> Cc: <stable@vger.kernel.org> # 5.15
>
> CFI first showed up in 6.1, not 5.15, right?
>
>> Signed-off-by: Prashanth K <quic_prashk@quicinc.com>
>>
>> ---
>> drivers/usb/gadget/function/f_fs.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
>> index 73dc10a7..9c26561 100644
>> --- a/drivers/usb/gadget/function/f_fs.c
>> +++ b/drivers/usb/gadget/function/f_fs.c
>> @@ -835,7 +835,7 @@ static void ffs_user_copy_worker(struct work_struct *work)
>> kthread_unuse_mm(io_data->mm);
>> }
>>
>> - io_data->kiocb->ki_complete(io_data->kiocb, ret);
>> + io_data->kiocb->ki_complete(io_data->kiocb, (long)ret);
>
> Why just fix up this one instance? What about ep_user_copy_worker()?
> And what about all other calls to ki_complete that are not using a
> (long) cast?
>
> This feels wrong, what exactly is the reported error and how come other
> kernel calls to this function pointer have not had a problem with CFI?
> ceph_aio_complete() would be another example, right?
>
> thanks,
>
> greg k-h
next prev parent reply other threads:[~2022-12-14 13:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 13:24 usb: f_fs: Fix CFI failure in ki_complete Prashanth K
2022-12-12 13:35 ` Greg Kroah-Hartman
2022-12-14 13:08 ` Prashanth K [this message]
2022-12-14 14:56 ` Greg Kroah-Hartman
2022-12-14 17:35 ` David Laight
2022-12-22 12:51 ` Prashanth K
2022-12-23 9:04 ` Dan Carpenter
2022-12-23 14:41 ` Alexander Lobakin
2022-12-23 14:51 ` 'Greg Kroah-Hartman'
2022-12-12 13:37 ` John Keeping
2022-12-12 13:49 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=214c4b8f-b86b-3e1f-d34b-ccfa756f3136@quicinc.com \
--to=quic_prashk@quicinc.com \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=john@metanate.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=plr.vincent@gmail.com \
--cc=quic_linyyuan@quicinc.com \
--cc=quic_ppratap@quicinc.com \
--cc=quic_ugoswami@quicinc.com \
--cc=skhan@linuxfoundation.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox