Received-SPF: pass (google.com: domain of linux-kernel+bounces-164842-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <59d61db8-8d3a-44f1-b664-d4649615afc7@oracle.com>
Date: Tue, 30 Apr 2024 20:01:11 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH next] vhost_task: after freeing vhost_task it should not
 be accessed in vhost_task_fn
To: Hillf Danton <hdanton@sina.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>, Edward Adam Davis
 <eadavis@qq.com>,
        syzbot+98edc2df894917b3431f@syzkaller.appspotmail.com,
        jasowang@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        netdev@vger.kernel.org, syzkaller-bugs@googlegroups.com,
        virtualization@lists.linux.dev
References: <20240501001544.1606-1-hdanton@sina.com>
Content-Language: en-US
From: Mike Christie <michael.christie@oracle.com>
In-Reply-To: <20240501001544.1606-1-hdanton@sina.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?MVFkbG1KbG02WDBXbTVKZ3Rab3hvWU5sWWdPSmg1Nlp3OTA1eEc1Vm9aVWpX?=
 =?utf-8?B?bFFDc3cyQkN2T0lFUHd2cjc2WFVPd3lSeWlGQkd6aFU0MWlhUGJ6aTFldEtv?=
 =?utf-8?B?TjB0eS9zeU83UHVTL1RIMVZYWDBaWE9hbFZkSGZuYk5KSDlSeDlqR2E0Wmls?=
 =?utf-8?B?T2RBNGNjSGVwVUdVMHNMaXlPcjMwbWIxY2NKUUc3TjY4eDdmZXlmMmNnLy92?=
 =?utf-8?B?bGxldVVrOHZFdXBKMXM2NE9ub1djNXFXSmpsNkFEWVNNME03aktRYkRjbjlv?=
 =?utf-8?B?V0N1Y2YwOHFtZHZvb1FUUUhqSUppdXdmbVhaYk5TMDNMcmFlTGVjU0Zjb3FW?=
 =?utf-8?B?SlBYZFRBcHVIZGNHaWQ4VEtkcVJjcFJXUk04cjZiYlNCbFRFaU4xeGtqVGpn?=
 =?utf-8?B?S0xiS05vdnBoTnJlcnFnRHJJcG5aZldWMmVyd0laa3FSZnBjYVhsTU5ZaUIr?=
 =?utf-8?B?K09lMTJhRUNiQVFGSVJMOEhMWGlOUit0bG1yRlV6bHZUcS93OGZVRDh3QXh5?=
 =?utf-8?B?VFhnZDExSlc5S1lYTmtBb2w1N2tISk8reUNVUVBIVDhxNmdKeHJUQVRlK0Fm?=
 =?utf-8?B?TEphVUcwZm43YWRpck1wY0ExTWlZWHJ2Z3BUME1DMjUybm1xWHgvMUd0eUlM?=
 =?utf-8?B?bEtNRmwxaHpsLzFFRjc3WGRsaTFldk50VnB3cmQrZVBGNUdaZzdwZEwvUDZR?=
 =?utf-8?B?ekRMcThjZ080L0FEZGU5ZjFxLzJ2VlZzN1NiOVl4d3B2czNNZlA5OGxGNGlI?=
 =?utf-8?B?b2toU1FTSlU4cjhVaG5EZytJZ3NXcjFTOGNXQnYxWUs1SUkxUW05ZGUwejBu?=
 =?utf-8?B?YjdwbHduTmwvWEZKcEpGM2NGcExyVU43Y3gzMitDRnMza2xCQVhYUlVPN2No?=
 =?utf-8?B?RXpuNmZkTm5YS3RQc09TVFN1dFFBZW9BUFBFdlA5akljdjhNN3JDaEhiZUZ5?=
 =?utf-8?B?bmpnL1dMb3RtNVloWENGdHVueFFrckVBcGFuRTZVQUJHYTZLTVVPdUpDT3gz?=
 =?utf-8?B?aWRoVm91YVFxbHNhcCtNQm02OWMyZ3hPMXliVlJwMmhINkJKMDNhaEdtSVpu?=
 =?utf-8?B?b3kzVG9SMTl1SnZOMk8xaFp1ZWc0T3Q3R1VIeTdZR0p5NjJINGtzMzN5L2du?=
 =?utf-8?B?aTE3OWwvaXEyb00yMWVEVkpLOTVmQ3BwUDFkYmZiMVgrZXpLQkIyWHFGZDBO?=
 =?utf-8?B?T1RjSjRPYTl1R2Mrd0VlZEp6THRKRytVb1hHVG1JWVRSQVZ6cFpMdGpsR0Jx?=
 =?utf-8?B?NGNXODBnMUhOMFQ5ck5rc1RKY0tZd25vUUJPZ1J6TDBydURCTlRra0c1OUpN?=
 =?utf-8?B?eDdEZ29NQkFlWHcxRHFTRS9TUTZvZDdJUmpJOVoyOFV1YjZMSjlCYmdsMnNu?=
 =?utf-8?B?RWVsM0xnR2NNd0Q3YTFEdjNZWXFTSHMyWWNUZW40M0RxOWxyM1dLUEt0Qlp3?=
 =?utf-8?B?Q3FWVXh3TWRnOEVzSkdPbG1BMGlOWGVOcFVkUm9Rd0cvbTBWelgxZHMydlYv?=
 =?utf-8?B?ZURqWGo4VTRpR3dMMnhBY2s2N3c1dzR6cFNIV2lRWlpKL3cxa0hLT1ZkUnhO?=
 =?utf-8?B?clNQVUJONGZBWkE5OWw1WDB4RW13eVJKZzFuUVVkbGpobTFKNktuYWZPQzdv?=
 =?utf-8?B?bC9lU0lEam1ZQnlzU2NFbXNVMjF1YkpJL0hmK0xGN2x2R0Z0eUwzS0xNdnNM?=
 =?utf-8?B?RmdYUDhPVW9TN25XclV6OFc1SSswdTZseUpUM0VsaHBYMkZlYTZ4b1Q3WURP?=
 =?utf-8?B?SDFEYlFYdDJBU1hockt0WTNmdUtaSS9SRWZmN3p2VWQwejZnY09ZVkZCVDA1?=
 =?utf-8?B?cnRiL3FmaEJzSGtYTlZvbGNnUWN1VUYxd2VwcE1Zc1ZtUktHc2JPVUx6VldO?=
 =?utf-8?B?VUJ3N1A3TUMrZHJZUHlVYjB1UzlveUlXNTBBNEFnV0J5OVFBYm1CZDdWejYw?=
 =?utf-8?B?L2NDTDBMT21wRE1MRXZLeGwrUFFCdEJTK096YjBIVDV4QjNLTjk1YStCY0o1?=
 =?utf-8?B?cHUxeDdHZFl2b2J0YTF5cUFCbVJyM0Z3alMyNG1pVTYzN2VHbE9WaVBtT3By?=
 =?utf-8?B?b1lnS0ZLRUVCT0R2UksvNHFQdlM0QnU2QzVkNm9ZS2JTWHdKenZBbWRvN3Z0?=
 =?utf-8?B?MTBTMDRGd3lCbFZGbkhvYUJva25ML09TcVIzMThDREN5U3JjUTFFbHdkR3BO?=
 =?utf-8?B?R1E9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	5hpH5pofg8DqW+MKKW6qn6HT81r/Znq0ddZ1KD1TpfwXJftQBFoZRHtd+CRHtO7kQKPwy5oFMn6PABcxxhXdvsItSxeT+7KA2DOGNP6ay0stvWh15a0ZXs0KnttKez/F4o1ousp+V3mXATYFdNeT2hfMtzRjO9oejDV6u1LxIy8kYzAmEKSR6GDFhv9ku/XlXh8SGiUKNL8KJR5uklswreuc42gjSURqFHjkXXouN8ZGG54x7BWTeTcPWUnGNP0ksyL7mZ8Brs/+2u9LvyM1U23y0U47rzXnLpXxevjzxyvJkbKByxTeuXpoBUtTWzMZpDwyeij7th/TBgqv8mHV6LkrpZQdLh6/cv8cTltevVJEyXKFLtUrdsSFBZhoi4OCix0g2f8DhHnlixTtcHBaf1eq6sNYCQQOp7ov/AzYtuX1m5p3EcKFNKizTHjr2DU5OR3nMatNxtZCAAkbd8UyZj1VunyHmRr5EGlnX8za7GsdJcSUPJiCfGLD9zJHJIcWB69V5AHYI67idiUn9LitQYThUkigvc5KuSIqGDa4B6rtEWbYLmM4Sgq/jJAnJDCFkvWahfExmDh+e1Kxw2TYN3ik0gMnRzyg4j4jdSoNYo0=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ed262578-b212-4d51-74e3-08dc697a3238
X-MS-Exchange-CrossTenant-AuthSource: CY8PR10MB7243.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 01:01:13.0320
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tvGGTU62/X993kLjOtbXQ/YhnSyT6XmvG/5jyfbtLD8LpCe1NY1Wb2GfDNCx5UF8WX6dATXe5hzChLYpoCycabeVMR2waLEp3FSPyxI2aJM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4121
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-30_16,2024-04-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0
 phishscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2405010006
X-Proofpoint-GUID: IitefCj1Idr92CnS7ZbmtkHTA-_AGIHe
X-Proofpoint-ORIG-GUID: IitefCj1Idr92CnS7ZbmtkHTA-_AGIHe

On 4/30/24 7:15 PM, Hillf Danton wrote:
> On Tue, Apr 30, 2024 at 11:23:04AM -0500, Mike Christie wrote:
>> On 4/30/24 8:05 AM, Edward Adam Davis wrote:
>>>  static int vhost_task_fn(void *data)
>>>  {
>>>  	struct vhost_task *vtsk = data;
>>> @@ -51,7 +51,7 @@ static int vhost_task_fn(void *data)
>>>  			schedule();
>>>  	}
>>>  
>>> -	mutex_lock(&vtsk->exit_mutex);
>>> +	mutex_lock(&exit_mutex);
>>>  	/*
>>>  	 * If a vhost_task_stop and SIGKILL race, we can ignore the SIGKILL.
>>>  	 * When the vhost layer has called vhost_task_stop it's already stopped
>>> @@ -62,7 +62,7 @@ static int vhost_task_fn(void *data)
>>>  		vtsk->handle_sigkill(vtsk->data);
>>>  	}
>>>  	complete(&vtsk->exited);
>>> -	mutex_unlock(&vtsk->exit_mutex);
>>> +	mutex_unlock(&exit_mutex);
>>>  
>>
>> Edward, thanks for the patch. I think though I just needed to swap the
>> order of the calls above.
>>
>> Instead of:
>>
>> complete(&vtsk->exited);
>> mutex_unlock(&vtsk->exit_mutex);
>>
>> it should have been:
>>
>> mutex_unlock(&vtsk->exit_mutex);
>> complete(&vtsk->exited);
> 
> JFYI Edward did it [1]
> 
> [1] https://lore.kernel.org/lkml/tencent_546DA49414E876EEBECF2C78D26D242EE50A@qq.com/

Thanks.

I tested the code with that change and it no longer triggers the UAF.

I've fixed up the original patch that had the bug and am going to
resubmit the patchset like how Michael requested.