Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <214c4b8f-b86b-3e1f-d34b-ccfa756f3136@quicinc.com>
Date:   Wed, 14 Dec 2022 18:38:17 +0530
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.1
Subject: Re: usb: f_fs: Fix CFI failure in ki_complete
Content-Language: en-US
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>
References: <1670851464-8106-1-git-send-email-quic_prashk@quicinc.com>
 <Y5cuCMhFIaKraUyi@kroah.com>
From:   Prashanth K <quic_prashk@quicinc.com>
In-Reply-To: <Y5cuCMhFIaKraUyi@kroah.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


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