From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3D00146D7A for ; Thu, 1 Aug 2024 21:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722549340; cv=none; b=sdvz9utnOcBVPXSGG5SjjGIP//olD/WTmNs1t/Zij/fc6PIryV/a+BlSOzieHaMFLiz55pRtBuLtvQAaD5FEtEf6TTxWLV67VNfSPJ7BmVX1b8UpJflBn7Ju4B52Hu6zNe2vAA++HZMzzln/zJhuySHvCEM+OnstV9OauHEof3I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722549340; c=relaxed/simple; bh=hpjXuBkpFMgQOYNMrQr8GIa7k5MgBbs6MBxuziGzuqw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=YAPzZAMR7ufQ1NN8V0QJ+kfj+cTMQkRk9oy5js0lhBgJEgHPu/PtjhBHS+P93IdV2gkX+8+BdYXz+kRVQaFWuDzzZXx+ERrDm0Y9hALiRb3YXQDnT9zxzOwLtgigRtT9dWWCKIuPlPHAX0+DNBtcTgBCu0mSzmrX9xBHK7p9bJQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=tvEbr43A; arc=none smtp.client-ip=91.218.175.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="tvEbr43A" Message-ID: <02f7cfc8-0495-485d-9849-b5a9514f6110@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1722549335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=22trdYbMHmtRm4bhtYQlLInAL9M2HQInv3qUMD+3ga8=; b=tvEbr43AKk9tHTYjephznY1RSml5L8OFRCqpWoG5SS6rn8Xw2KDbzjPAVOaD1s1hsXqwhm 44fJ8xKYoQqj2FtziuG1JIYRGCg60jPiHuOKL1DqRG0rEa9BRUg8TUZZWjWZPBiWV+JrkD VPqAyCFl7JU6xAr6xbLoCxokQarEpZg= Date: Fri, 2 Aug 2024 05:55:24 +0800 Precedence: bulk X-Mailing-List: target-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH for-rc] RDMA/srpt: Fix UAF when srpt_add_one() failed To: Junxian Huang , jgg@ziepe.ca, leon@kernel.org, bvanassche@acm.org, nab@risingtidesystems.com Cc: linux-rdma@vger.kernel.org, linuxarm@huawei.com, linux-kernel@vger.kernel.org, target-devel@vger.kernel.org References: <20240801074415.1033323-1-huangjunxian6@hisilicon.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Zhu Yanjun In-Reply-To: <20240801074415.1033323-1-huangjunxian6@hisilicon.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 在 2024/8/1 15:44, Junxian Huang 写道: > Currently cancel_work_sync() is not called when srpt_refresh_port() > failed in srpt_add_one(). There is a probability that sdev has been > freed while the previously initiated sport->work is still running, > leading to a UAF as the log below: > > [ T880] ib_srpt MAD registration failed for hns_1-1. > [ T880] ib_srpt srpt_add_one(hns_1) failed. > [ T376] Unable to handle kernel paging request at virtual address 0000000000010008 > ... > [ T376] Workqueue: events srpt_refresh_port_work [ib_srpt] > ... > [ T376] Call trace: > [ T376] srpt_refresh_port+0x94/0x264 [ib_srpt] > [ T376] srpt_refresh_port_work+0x1c/0x2c [ib_srpt] > [ T376] process_one_work+0x1d8/0x4cc > [ T376] worker_thread+0x158/0x410 > [ T376] kthread+0x108/0x13c > [ T376] ret_from_fork+0x10/0x18 > > Add cancel_work_sync() to the exception branch to fix this UAF. Can you share the method to reproduce this problem? I am interested in this problem. Thanks, Zhu Yanjun > > Fixes: a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1") > Signed-off-by: Junxian Huang > --- > drivers/infiniband/ulp/srpt/ib_srpt.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c > index 9632afbd727b..244e5c115bf7 100644 > --- a/drivers/infiniband/ulp/srpt/ib_srpt.c > +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c > @@ -3148,8 +3148,8 @@ static int srpt_add_one(struct ib_device *device) > { > struct srpt_device *sdev; > struct srpt_port *sport; > + u32 i, j; > int ret; > - u32 i; > > pr_debug("device = %p\n", device); > > @@ -3226,7 +3226,6 @@ static int srpt_add_one(struct ib_device *device) > if (ret) { > pr_err("MAD registration failed for %s-%d.\n", > dev_name(&sdev->device->dev), i); > - i--; > goto err_port; > } > } > @@ -3241,6 +3240,8 @@ static int srpt_add_one(struct ib_device *device) > return 0; > > err_port: > + for (j = i, i--; j > 0; j--) > + cancel_work_sync(&sdev->port[j - 1].work); > srpt_unregister_mad_agent(sdev, i); > err_cm: > if (sdev->cm_id)