From patchwork Thu Jul 27 17:57:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 127128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1323788vqo; Thu, 27 Jul 2023 12:38:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlEf7Ui7rRSoJ5fM23/BDH4eE+0V/eshqb8A8FOrx5KdxJhqbJ26Iy1rcSYd18aQcwZymLU6 X-Received: by 2002:a17:906:5dc1:b0:991:dc98:69ff with SMTP id p1-20020a1709065dc100b00991dc9869ffmr92615ejv.67.1690486713249; Thu, 27 Jul 2023 12:38:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690486713; cv=pass; d=google.com; s=arc-20160816; b=nMucrpZtMw2bmUYaBXqlQc4aDsYUhFkeLF/+02trV2tuWkEd1bz7cLMquABZsF9u2g C+5fGGfO6dwr1hWDi3eobb55Ko7FdqV/rYkFdmvc8I1uQ11BRoUyOPntJ/NNUDWvB7jh 39R3lJTlxAR5Qd/s2LrLlwho1wN/k0cNLpanZDiUw5XXpvG5YlqcWK0mpm5mblXEvhru Q3aRDxvv1xlSexEsSZkDkbA5LhcICffk7XujBQup1lGjwQS220BhLcgKqpZDAPQdaprQ y5KtcGwIScqr6BvYQ0cEql3/3CQVwumQjMIM6gdYTJ0Oz6+In1azNhYY7PsGvT8llWXb ezxw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=a8UMif7Br05o4sgfEuqtA2qO+wkMcJ6NxdPG1E1yAJo=; fh=FFWu5ZHn1TIHTcapRVZJR3gUVU1ouQq0me23sgbeDPw=; b=YkHPnTh1Plsn63glUCb6NraXjacJvKsBiucxsP22lTNCPjj7KBO0wlUfVZjGe3t/NL WLjlql0i+8VBxg2+GQu1RTdZpidcjBINFMulAHmOn/2OXS1YONfN1/NHnewIdHx2XbTp d5Ni//0BPr4tKJt1CDU7WWUZXJfdw1N4S1ZMBK4FwC+VefiXsAkyHm+x3EZpmA2yR9m3 9N6bKRFLzuA5t1YN5ov4/7vasa3CIRvnk3TM9OyCknIVDEIAbGGG2PPfZ8XJumJn/p/u YDhuGY1TZzgtFenQ5oQs819yx+mrjY8dpqv7b5jO87h7g+vwRV+yy13MyxqJgbie41BE GkJw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=K4XML+kP; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l19-20020a170906079300b0099279b2cdd8si1424712ejc.831.2023.07.27.12.38.08; Thu, 27 Jul 2023 12:38:33 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=K4XML+kP; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231584AbjG0R6m (ORCPT + 99 others); Thu, 27 Jul 2023 13:58:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231414AbjG0R6l (ORCPT ); Thu, 27 Jul 2023 13:58:41 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2081.outbound.protection.outlook.com [40.107.243.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1234358A for ; Thu, 27 Jul 2023 10:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SiThJ1vRvDMeHmVlw0DeuwOgbZKieItlOTegxbaCuK5h8yggj0xmoBnmzuN9bRDk5WgSxj5qwNtySOt5lBjV9iJfBOJ5wMoPtIDz/1anWKE7vdDyJdUr2NtIwEwy25JlSQKnEkS4BfcnL+dWky8UQ46mgYGXTRpEQAayd4vFV0XaMeMVCJsQk/oxflPRVRZ2NyhaEG7hrV8MwlXH48RQ6CFgCQzfvQ4in3BZdQx/ROcLW1A2mge3ANfVzqtucFyDOCemS5ONQVWDC4Dkon0ZoINhXF9ifAJiiSgGVSbppOUctDGWtZREhfy4e+oYuKnOoCc8DMC2J1ZcAZHmFhLefw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a8UMif7Br05o4sgfEuqtA2qO+wkMcJ6NxdPG1E1yAJo=; b=c7T5h/KvOz1wZ6kkcHMcV+714FWjL4LWxn3FoATA4F0iZAvVk3F8cxUDsCME0VD3FDEjm+tPz4aKeh2Xww2oBmjT54dOlCXXwADQWou2j9XChtiYlCNsdGlost6wQTK/NFHXSAvnRm67gf0Y4l/8zOfYUQiTeV9GzaU56KA7Hbr4M/uXi1YnE1Egcu4zs1dyd+MZqccK7kaCDR1ruItCwR/bGYkKjJMsvzqbiPtbxCwPJKtmkYKQsY64i5R2tAmWuEGx7f0OJkd2/xfFxigNAIEpDzstQ/obXJWFcpE47rssIV97jlq1iNnzfJJFIdKp5Jl41s5vdzp2+B8Cu/b3Ow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a8UMif7Br05o4sgfEuqtA2qO+wkMcJ6NxdPG1E1yAJo=; b=K4XML+kPm1OYYXRpa28eCCJCVw8+pYucKEzuWd16YPv8rD7im8+o0qMgB2DAZP2LSpTCCUWaYKb40Q4xxERkut++JA3sGtX+s4QiumHhDY6B2Whcs4z2bywD1bWbfeMGzAFVRqCbZCkYY9Ky8G1ltaaAWsmcptMCkjKI5lTGzdNFCNZdPLily4/G4VhTDdmAMislnwSdN3pfZDe59cOLljCa7LTamKOF3eglMCibcyx1wfLtf8KJ6AZ4RRvX8RxgYV1gfmBcEC40PwLZ8u6pvQ3vFGy08MWYPNDjTSPjxAdmd+vEdYllzIPreG924HF2+zBI2fVIvwwhNRWRXZ6KuA== Received: from DS7PR03CA0211.namprd03.prod.outlook.com (2603:10b6:5:3ba::6) by SJ1PR12MB6027.namprd12.prod.outlook.com (2603:10b6:a03:48a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Thu, 27 Jul 2023 17:58:33 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::6b) by DS7PR03CA0211.outlook.office365.com (2603:10b6:5:3ba::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29 via Frontend Transport; Thu, 27 Jul 2023 17:58:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29 via Frontend Transport; Thu, 27 Jul 2023 17:58:33 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Thu, 27 Jul 2023 10:58:22 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Thu, 27 Jul 2023 10:58:22 -0700 Received: from c-237-113-220-225.mtl.labs.mlnx (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Thu, 27 Jul 2023 10:58:20 -0700 From: Dragos Tatulea To: "Michael S . Tsirkin" , Lin Ma , "Jason Wang" , Xuan Zhuo , "Parav Pandit" CC: , , Subject: [PATCH 2/4] vdpa: Add queue index attr to vdpa_nl_policy for nlattr length check Date: Thu, 27 Jul 2023 20:57:50 +0300 Message-ID: <20230727175757.73988-5-dtatulea@nvidia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230727175757.73988-1-dtatulea@nvidia.com> References: <20230727175757.73988-1-dtatulea@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT042:EE_|SJ1PR12MB6027:EE_ X-MS-Office365-Filtering-Correlation-Id: d9616b4d-734c-4920-5bfb-08db8ecb17d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hlp644XSkCNUaICQJ1K/cpwc1e4ysjXHlhQ/dkuuvK7JgRjeaYLpfTIKO3N9R4G4aVN5izwrDIAGh1aGRpEO0QsPNaFlBJ5UyHSzHqLoHHu4wwluod75tw6j7Gk2SYr3gWXByVquVeb3vZukvBc3Np9ipSt/4z1L+7NxDQqSLw0dG3AlTusUYYr/vkGXPQN6pQaFnSPdkDbiudB5Va4mXDO7FVI7nyT84qBx1o63md98IHngLuwPXA1nPCTR40C9rg1OG7y9/PnCKeZhnBehGmduNeddim69r2fRfmagCw1k3y6yrfMItmw69kQkC6UrmafJrMOStv37j4iX7Qgo6fLmPC5TObWNBEIgLXNzg4fcWo0WeWim92Z0ApIGIs2/ahM5c4f31YpR/fD6IA+D0nNVIGSMvzNc+XEVof3GWY2+Khrp/WXLpM/dypHzS390HKR03VES5Yu1SKK35r/bHSUDeIXwVAMFBg4qJVL0Wj7wTDvs3KHR5xKSpkH/jf+8AloVy++YqJ9KhhRxm3mYgzZZwcp9Dm4OlvtSRD49uPiTCcTKlu7swEj5nW9QUa1/vy/XVpBL4wDTxZb12H5rmIVRDXUpPlRQiaiV40qGxbziXKUS9oe3ERyQ6xls2N2+7cvU47fD5J3HTErbIz9kKBrRfLhZsm0xvRhdRzBqoRln/Kzb/FhQA/e4x0SkRzPOGGnv5bXt9XkrVBxs8luczKGrVwlRysSVmx5zSRavDReVd149ZOjrMQ07+1iC2qWH X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199021)(82310400008)(46966006)(36840700001)(40470700004)(47076005)(478600001)(110136005)(54906003)(86362001)(70586007)(6636002)(4326008)(1076003)(316002)(70206006)(356005)(7636003)(40480700001)(186003)(6666004)(8676002)(336012)(26005)(82740400003)(40460700003)(8936002)(2906002)(426003)(41300700001)(5660300002)(2616005)(36756003)(83380400001)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2023 17:58:33.0949 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9616b4d-734c-4920-5bfb-08db8ecb17d4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6027 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772603795608879393 X-GMAIL-MSGID: 1772603795608879393 From: Lin Ma The vdpa_nl_policy structure is used to validate the nlattr when parsing the incoming nlmsg. It will ensure the attribute being described produces a valid nlattr pointer in info->attrs before entering into each handler in vdpa_nl_ops. That is to say, the missing part in vdpa_nl_policy may lead to illegal nlattr after parsing, which could lead to OOB read just like CVE-2023-3773. This patch adds the missing nla_policy for vdpa queue index attr to avoid such bugs. Fixes: 13b00b135665 ("vdpa: Add support for querying vendor statistics") Signed-off-by: Lin Ma Cc: stable@vger.kernelorg --- drivers/vdpa/vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 3ad355a2208a..75f1df2b9d2a 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -1249,6 +1249,7 @@ static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] = { [VDPA_ATTR_DEV_NET_CFG_MACADDR] = NLA_POLICY_ETH_ADDR, /* virtio spec 1.1 section 5.1.4.1 for valid MTU range */ [VDPA_ATTR_DEV_NET_CFG_MTU] = NLA_POLICY_MIN(NLA_U16, 68), + [VDPA_ATTR_DEV_QUEUE_INDEX] = { .type = NLA_U32 }, [VDPA_ATTR_DEV_FEATURES] = { .type = NLA_U64 }, };