From patchwork Fri Sep 22 17:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143846 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp56507vqu; Sat, 23 Sep 2023 01:34:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbBM3WNLeni3s4T54+nnLCcWnhudXqwkMkXaZEEfkGm41UZNyOtbYSb+rffuxgC5pDvUSG X-Received: by 2002:a05:6358:897:b0:143:91a2:8e0a with SMTP id m23-20020a056358089700b0014391a28e0amr2608649rwj.4.1695458052126; Sat, 23 Sep 2023 01:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695458052; cv=none; d=google.com; s=arc-20160816; b=iIxZKwWj/VS358TjCslpQIBrHzzrc/TvBWM7hDdwPVdQmppv9gPcVwxcnGatyt1tk9 mfvlDlHAuHZrIaZ1eIqAweKQppglQJBsHh9Le7d1RjTVkPTlw5fwervDxuKzekZHeGcZ mGcjelwxzyjJPBYSEFr3ZMAVOkoYPJbCfP9z+fL+1FrPPIgw6fmxISHJo5jgaGyrbh1d l/wmPEfKTbA55baRi1aoTh7QDrZAXBTlhvJ4Ai0WWW+sbc6aahP9GyfP/oFg6TYWuz00 FjGv+UNlrlQLOwMcfRSfHoFtFU/384ikB/kANHd7IyiyxCYlUXzMT+v/vTwmFAqkqWOI 8JeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=AS3G4n4TBFZWhDodrFk3+wfFKjlDza+m4CiwBMh4z08=; fh=U3STSggtscAXkhYDcfnWHiudEjf1y2Via7wauA5G7Pw=; b=CS9ni8/ho+9SPP93zqfG2xAHsMuBm0KAUZ3i6QS53AvAJWxyl31WK5ZAf92toQjUXk 4IsEIWDZ+reujaZbBdEh7pcRVTFHlVJc60eDoWP9I1vDSD8yTYsZBHDb/NlhI9AyUfn+ ZPJTSnZsDojnxTlWjlI1SZMvoJomLcDniTzxWismpM3XARS+MOwuPQ0m2ACfsc4/A+YZ gDKLWzmvfNTF9kEjaUWD9ZCmA2o0D4MGNEPpbXr4dOe/Mp11AdPJDxHWT3xZsxSGigiE p4MHhRPkQstXdAAnfzndoe4eaiX8eFrr8tr2+bqC0h99ZM6Jeh76n3yE8rnR+c+zENTo FhqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=d+2RKER5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id eg6-20020a056a00800600b006896e2f30f2si5512087pfb.365.2023.09.23.01.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 01:34:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=d+2RKER5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id D71E1823C103; Fri, 22 Sep 2023 10:52:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233449AbjIVRwG (ORCPT + 28 others); Fri, 22 Sep 2023 13:52:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233642AbjIVRva (ORCPT ); Fri, 22 Sep 2023 13:51:30 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 064761732 for ; Fri, 22 Sep 2023 10:51:04 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-690d9cda925so2253156b3a.3 for ; Fri, 22 Sep 2023 10:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405064; x=1696009864; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AS3G4n4TBFZWhDodrFk3+wfFKjlDza+m4CiwBMh4z08=; b=d+2RKER55W5nufMg71buhJolDsS2gCKDAcGqF4zJ3Pe0Z2jqLG7gZ5IlGJbK9ppX/D 1x8IBxHP3w+hJ+Y7MfRERAxWTzfOe/kTFHa76d/4rbZgQ8vI+FGn0CVtbrFUm8AGcaCO EDHBzGuU9UekK3CSKXQMjA+VzElujTGJ+Y9G0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405064; x=1696009864; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AS3G4n4TBFZWhDodrFk3+wfFKjlDza+m4CiwBMh4z08=; b=T/inegf28wVTQwwnpUW+G3Pal4YLoZcx4zTOsdbYna/5dLlIOCmcBCNF+fLvXeGhNK rxe7WQxjltccV3bNrgR2sTlEVijFdIFNFQ3R/OjiILVk1my3yO1cPvgTAIAMwRFUy18P SdJAkdYCgZbT0eYA9gQkoF90MKNb66uhJ7KHWYV5D04u1PGeTAnRP9fED90K6oOw7tfo 5s/tUdcp66N0qXsjBJVbtCYNR7AN23puC1TqEU2Ail4XYqd2jzbKHFT0GPzmdTv9e4cQ UKqgmrVXarjZyE76buYXzr1j+oETQFOtcGmj8jQKUomPzwRHntuxcCZeycvnue56uDyv WlgA== X-Gm-Message-State: AOJu0Yy09PWtYdKSH5uKsvEZrYP0tFd0YBx9xcBCg+5XrgaKwKi32CQ9 NjKsEDbv3UZVwIvJiuNOAlQKSl9xoGlYxzUV7OY= X-Received: by 2002:a05:6a00:b8a:b0:68f:c1e0:a2a2 with SMTP id g10-20020a056a000b8a00b0068fc1e0a2a2mr140611pfj.2.1695405064282; Fri, 22 Sep 2023 10:51:04 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id c5-20020aa781c5000000b0068883728c16sm3578344pfn.144.2023.09.22.10.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:51:03 -0700 (PDT) From: Kees Cook To: Fei Li Cc: Kees Cook , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] virt: acrn: Annotate struct vm_memory_region_batch with __counted_by Date: Fri, 22 Sep 2023 10:51:02 -0700 Message-Id: <20230922175102.work.020-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1918; i=keescook@chromium.org; h=from:subject:message-id; bh=WaY2kTn1yazHmHr2C26ITAqyjQkyOX3EcAXSRAFMvEA=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdQGkCer3a+lUOaX41nf4FcmcDwvJGoS1PC2Z Iea3hnu5/OJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UBgAKCRCJcvTf3G3A JmrtD/9ts1iJRTn7bBnCOgTmeuo7qoznjoC5NTZ4ik9kMqawaTuBpBZ1WS8SBzYaVsI8OhxmZZc xtx8FWQrwBaVz/uohBSxVolrfYlB3eF7ma2LKObYd83wqZL+ZThz6qTZCl+sqMOAKge7u/sF+3p EoGtoBiTriiCo0zWetez0Y6CcfC17sACn59R8WwX3XMqF9Hx7/zU2nPtRnRPH1B001HUKJnRyQP fNjZ6HITNFGyWZNMZeybw5era6sVgjqAwpvJbRMhO6R87FF4lZ2DdWlgx5bhZppw5goxZ+wctbO 5fAg7ymNors8GOvDWnQwKhUlXn4LUQAeqMf6+kRZz9mY4Y7XsP0QAq6V4DDdpgRa8FEL3HPW4Rq SAeVc4p5ZFsdUH+HeNbYcQVETfjeXCbUPrNdv7gE/uzPmROo6wBUTB+CG7YFUDudDyLm86Hus7n 3fAgTATbG/IiEgghWm2cZ5TI4mqw0jD3x+f9KnSR1/EClerCP31Mo5zp6XhCyf+9Xr4oJ3Th4dn uPSG0PiTPvnM//nEhcYelWoyHfOieXsssjSmglLpV74yncScIy2fWA7UqXuxTJuqgbwS+/XKQZ2 IklKbqDIGO2aoyPmqUhGyrUI2MtNGJshZ71rWLeQMXHQ0rwRe3D2MFerE7eOYH+eHbd2dNILfjP mxMYluz dDRVsfCg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:52:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777816622040339641 X-GMAIL-MSGID: 1777816622040339641 Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct vm_memory_region_batch. Additionally, since the element count member must be set before accessing the annotated flexible array member, move its initialization earlier. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Fei Li Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/virt/acrn/acrn_drv.h | 2 +- drivers/virt/acrn/mm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/virt/acrn/acrn_drv.h b/drivers/virt/acrn/acrn_drv.h index 5663c17ad37c..fb8438094f6f 100644 --- a/drivers/virt/acrn/acrn_drv.h +++ b/drivers/virt/acrn/acrn_drv.h @@ -60,7 +60,7 @@ struct vm_memory_region_batch { u16 reserved[3]; u32 regions_num; u64 regions_gpa; - struct vm_memory_region_op regions_op[]; + struct vm_memory_region_op regions_op[] __counted_by(regions_num); }; /** diff --git a/drivers/virt/acrn/mm.c b/drivers/virt/acrn/mm.c index b4ad8d452e9a..fa5d9ca6be57 100644 --- a/drivers/virt/acrn/mm.c +++ b/drivers/virt/acrn/mm.c @@ -250,11 +250,11 @@ int acrn_vm_ram_map(struct acrn_vm *vm, struct acrn_vm_memmap *memmap) ret = -ENOMEM; goto unmap_kernel_map; } + regions_info->regions_num = nr_regions; /* Fill each vm_memory_region_op */ vm_region = regions_info->regions_op; regions_info->vmid = vm->vmid; - regions_info->regions_num = nr_regions; regions_info->regions_gpa = virt_to_phys(vm_region); user_vm_pa = memmap->user_vm_pa; i = 0;