From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 93F6A26B091; Thu, 13 Feb 2025 15:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739459898; cv=none; b=QssH8SqU5WEF8xkPVh7FJPxI6i9tFsqOQyALBsfqvwW419PH36yMuNg6KtF64KS2PMt3Ql6c8K3Nigoms2sbpZ6OKiheq+cuzbSrAHtDyepTRGjG7AY+X2n6UdcrAjlYqFxhUcE63pI1cm/6WvImFCCD5GoZLO8ug+Eh4c4zFjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739459898; c=relaxed/simple; bh=pbHZs5NjwmTNgtR2N3l2+EFEU2yYFUx558DNoKkurPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=A0ViHMRMI3OGmPanq0EHTd92vRbFV46ORRwft1s0IGGZt1mnWBAtFB2yEVo0GwmGASKTu38kjvlnjPJBFFGygRtjajaWN/zFs5jeqpkMMxU1g3LoGsiS+1VeGzONDnPLhwqfRGxVOxWPVYCXY8hs5kpWH/B914uZMuale7t3eGc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Dgn8AyFw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Dgn8AyFw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A772C4CEE4; Thu, 13 Feb 2025 15:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739459898; bh=pbHZs5NjwmTNgtR2N3l2+EFEU2yYFUx558DNoKkurPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dgn8AyFwLctePorCMkJ97/Fghs9MOB2j8/L3v/oW020HNgJCOlrzYT1Eg2rtIRPqo QM/yZx0A0iPhKjLcz9luZUB0slnUibl2rQT49go/2qkhMIZTBPgBABUdH37MO+bewC E0mtfa6TtP9e+MKLbVC/gj0PhGIPwkpPSt1PZxBc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mostafa Saleh , Eric Auger , Alex Williamson Subject: [PATCH 6.13 396/443] vfio/platform: check the bounds of read/write syscalls Date: Thu, 13 Feb 2025 15:29:21 +0100 Message-ID: <20250213142455.888812310@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142440.609878115@linuxfoundation.org> References: <20250213142440.609878115@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Williamson commit ce9ff21ea89d191e477a02ad7eabf4f996b80a69 upstream. count and offset are passed from user space and not checked, only offset is capped to 40 bits, which can be used to read/write out of bounds of the device. Fixes: 6e3f26456009 (“vfio/platform: read and write support for the device fd”) Cc: stable@vger.kernel.org Reported-by: Mostafa Saleh Reviewed-by: Eric Auger Reviewed-by: Mostafa Saleh Tested-by: Mostafa Saleh Signed-off-by: Alex Williamson Signed-off-by: Greg Kroah-Hartman --- drivers/vfio/platform/vfio_platform_common.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -393,6 +393,11 @@ static ssize_t vfio_platform_read_mmio(s count = min_t(size_t, count, reg->size - off); + if (off >= reg->size) + return -EINVAL; + + count = min_t(size_t, count, reg->size - off); + if (!reg->ioaddr) { reg->ioaddr = ioremap(reg->addr, reg->size); @@ -474,6 +479,11 @@ static ssize_t vfio_platform_write_mmio( if (off >= reg->size) return -EINVAL; + + count = min_t(size_t, count, reg->size - off); + + if (off >= reg->size) + return -EINVAL; count = min_t(size_t, count, reg->size - off);