From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f99.google.com (mail-lf1-f99.google.com [209.85.167.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91D3442C512 for ; Wed, 29 Jul 2026 17:10:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.99 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785345050; cv=none; b=E7+k2TWG5QS6jAry8BuXFYCstjvMQrXgMkwZOLlXhPqhEPZgOBdu0+yVhDXcj3GTkxjtDSFBQ7kS0qyOqIMpm/Odf3OdVp2bZfKl5KvuTaWVo3cwySPtMaaKFDL1YIDYd0t0rYwyNamJHaSxH3dClWS6lMBhQsa4m9dhCRSI/k0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785345050; c=relaxed/simple; bh=cNsm9srFKdcxh4Hu4o49svdqGrknL6dwkH/kWJZbx3M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ak6jSHEQX2LWLqEokRSHVL4MSGKQ8K66/W2iGT7FkDqg91HSsfFuokNh/ZsJnugrUDUaTjCMDicR5/t90noEjp7AGE++oOI/rYeKKui4u4nA5seaxcn9druWkHyGVjMg0AHQFh7LbJq513Ir74LxdcztX5MvMGyoxW4AGJ+Ukb4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=Vx+fgW5p; arc=none smtp.client-ip=209.85.167.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="Vx+fgW5p" Received: by mail-lf1-f99.google.com with SMTP id 2adb3069b0e04-5b2a1fd0ab0so109569e87.0 for ; Wed, 29 Jul 2026 10:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1785345045; x=1785949845; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=MUVXONXXewungYBAriez9R2lFijUHBs599t/+Ybt3RM=; b=Vx+fgW5p7uDdBzuHKIIZFqpMOof768Tk52EViJP7NmwgtdypxctrSr3rfIfTr+QLmV QoWMpV3zeBFQETZwcqwethbt1oOhkyjtgIEAyXJy0sypSI5SgfyKPo6qo2f+DfhD9qvs kUNtbWrH5gwTAseFubJ2Cbx+oV4ba3AWXk6kZ/pKMS4zZi9Ave/HNKUwuwl7nmikN07b 1oneY0trhXZgv74ti4nUxV8e8ahToiTTr/RZ631ixhG5kLGroQTfvYoPj0cchU+Iwz2r D+0ETt0FoP8AAhBM2JQw4zC4oktg5R0/E1dfbtoiObsLKZn9sgELbaQrqL3pH+SrKoBs W7dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785345045; x=1785949845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=MUVXONXXewungYBAriez9R2lFijUHBs599t/+Ybt3RM=; b=GC4jAElbvOB2Ry2H1/7f5xVwXlcRpM+0VX89lMvl1cTPy39CnFi0xEVPyZgWBTfVzg lf98AorgmFhX0880ApFiWZhqVrMsW7UfJSQci9AMAHUZ5tYXxy6WFsGluekYFnoKDtPD WNVWeq+1+FHoGNgsYH8qobHdb3/ySqtsNWcWd2UqtPtRzS+UinpE6jkFtI5MT7ULrABl /m6yp98j6HU0SSeo1CbN4/nrZr1AAJAbYf0FSi6bKK90vslTKw3TO741jAgKZMidQmSf fDPkMF52moxcoRaCnc6cUilIRvu/acur3n0R0cx5YFPJ/rky4BpGzBAHc+6d9ES9sU8v Ox8Q== X-Forwarded-Encrypted: i=1; AHgh+Ro8oFvnhXO4/RpfeuLeQkotOx3z8YzzoF/G/PxRe45cAtBK88P4+dVfW14VHoFyViWtyR/behL5/GujyVM=@vger.kernel.org X-Gm-Message-State: AOJu0YztcJKHCKtRRtKIbU6ONhZvETEdJv+lbMQ7tvFAvIvmBDpMvsoK YqXZArw0SKRjmxE5M/9GlfNJLyEpta9OgnxYWIRfbxVTxaUdWXu68GgEfbIbDNlsrY882r2BYt1 4vk8LoZLi2LrLo4bQpBaWsZbN5nDG1NHXFaqMWE8TIECgQtPDGoKl X-Gm-Gg: AR+sD13wQpb8vVhXd/DPxwovkE3T+5h1rggXbeqh3VDD3sQvY6LwyeIDzU4am1a8IQK HeEJ1KNj8mqmvENm9TDtIA/s2Sb+Z7vewTth92NMu9H7cLpQurl+2LNj0jWDT/JZF6UjidQx8z+ xRa4yKeBSHMPFV6wqptLnUIdOlneu68318HeV/a0mSm5tZS61KxYeK91pW1HP8OGO8b2cZSYD5E L7yGfVQuVvVoRjzvdFszv38dL4CpYrhtGnHSNWRau/+syux3wTn4AkIouzqofxjL3wA4CZit0Rj 9yqOUMt6is25f27WoWnMv8+SiCnNpBQwgK3mVYXukeZ2wgolAb+vZ6OL1AA+Tzl5VLhulOl5Qcr rOwJKSk6vVRB8vdlaVw== X-Received: by 2002:a05:6512:6cc:b0:5b1:4fde:61a with SMTP id 2adb3069b0e04-5b2d0247dc8mr1433984e87.2.1785345045371; Wed, 29 Jul 2026 10:10:45 -0700 (PDT) Received: from c7-smtp-2026.dev.purestorage.com ([2620:125:9017:12:36:3:6:0]) by smtp-relay.gmail.com with ESMTPS id 2adb3069b0e04-5b2d76efb56sm281541e87.30.2026.07.29.10.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 10:10:45 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (bond0.slc5-n17m28-k8s.dev.purestorage.com [IPv6:2620:125:9025:20::a31:41f]) by c7-smtp-2026.dev.purestorage.com (Postfix) with ESMTP id AEF9A401D5; Wed, 29 Jul 2026 11:10:43 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id ACB04E4017C; Wed, 29 Jul 2026 11:10:43 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 1/3] ublk: check import_ubuf() return value Date: Wed, 29 Jul 2026 11:10:39 -0600 Message-ID: <20260729171041.45061-2-csander@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260729171041.45061-1-csander@purestorage.com> References: <20260729171041.45061-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit import_ubuf() can fail if the address range (provided by the userspace ublk server) is outside the allowed user address space. Return that 0 bytes were copied if import_ubuf() fails rather than passing an uninitialized struct iov_iter to ublk_copy_user_pages(). Fixes: 981f95a571e3 ("ublk: cleanup ublk_copy_user_pages") Reported-by: Ming Lei Signed-off-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 4ca6ec738c93..098e046505ad 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1473,11 +1473,14 @@ static unsigned int ublk_map_io(const struct ublk_queue *ubq, */ if (ublk_need_map_req(req)) { struct iov_iter iter; const int dir = ITER_DEST; - import_ubuf(dir, u64_to_user_ptr(io->buf.addr), rq_bytes, &iter); + if (import_ubuf(dir, u64_to_user_ptr(io->buf.addr), rq_bytes, + &iter) < 0) + return 0; + return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; } @@ -1494,11 +1497,14 @@ static unsigned int ublk_unmap_io(bool need_map, struct iov_iter iter; const int dir = ITER_SOURCE; WARN_ON_ONCE(io->res > rq_bytes); - import_ubuf(dir, u64_to_user_ptr(io->buf.addr), io->res, &iter); + if (import_ubuf(dir, u64_to_user_ptr(io->buf.addr), io->res, + &iter) < 0) + return 0; + return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; } -- 2.54.0