Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp2693364ybg; Fri, 5 Jun 2020 22:09:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuvLMPpu7ZQ/QnYT7NeZk2kC91Nblhm8m3gyZE++/ak+0i8G9JFAKqg177NJ9dMBgra9kM X-Received: by 2002:a17:906:2e55:: with SMTP id r21mr11617644eji.338.1591420147778; Fri, 05 Jun 2020 22:09:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591420147; cv=none; d=google.com; s=arc-20160816; b=pu5OGx8FTDerUGlpT0PBKRCisSpnjC/cQQ91TgI2CByIlH/udGPYxtjhKeLMp1zykt XAzof+gZWLuaeoSUtBfD41tLVqn4wfeBJTxJOAj9wiy7Q+6yFRil0BmeMihab22GwTnj Ka3SFaHrm7QJ/6V+xRsoPrOszeR+KtFKKNAyxJqaPhbNynAT+LpzI977Qy+qRoWAqu40 w0Zf4IYtaprP9G7ULeEnfkjHNW6+IA4Ty2lyGpPgDDqWbbbTTZ3ba32Y1AOaFearQWPP Q5fQQWxjG9j234WeOGHwsePa/ndevvLTSgGX6AGgbKbApqmHFdl4xPr9JfJpOQ3yZxYb lWeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=JPCDjhWyTHrRtN+IrpzH/X2NJ9wHqJH6zPza8eFFddg=; b=X4M2Oc4CwewcTRZv61z8A4C6mAEYGQUCjliLkdhgR3RUzjzeM3hTEUKaIeckETQBfK kJzySvBp6BBjwJ8SNh573gSS9+jkw+7KkBPGXoN+tmJKrIa00rDokqLxdvP8epwsDHFD 7BoA3D4ZEKy3tgNUKckak4JeVPRntzm18Fo30aV/WqhjF5lckMjj2mLtSKvgQExRyyhD +Z1pMuzh5b7rv1AzQIgUUWppnrk5e7XNnBjiOaQlnsKLImgh03u/rQtaJ4keu6S/4gUg cLTPnwaUSuJAooFWOpYe51qWJF3oLpS0Kbt5ut7drGp3aoo0GeCWIMQGknbdfAdzXgPa hZhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=heXQVB0H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs3si4806279ejb.599.2020.06.05.22.08.45; Fri, 05 Jun 2020 22:09:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=heXQVB0H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728611AbgFFFGg (ORCPT + 99 others); Sat, 6 Jun 2020 01:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbgFFFGf (ORCPT ); Sat, 6 Jun 2020 01:06:35 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA7D4C08C5C2 for ; Fri, 5 Jun 2020 22:06:35 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id ne5so1023771pjb.5 for ; Fri, 05 Jun 2020 22:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JPCDjhWyTHrRtN+IrpzH/X2NJ9wHqJH6zPza8eFFddg=; b=heXQVB0HRERw2lJEL+FZJs1VzyxsTGKyD/fjzLM4tVfeuhc+gjg++Vbom2rznRFIEf RGHx8n6QG/xgYzUxyCfOD9Qqz/Xl9wEtWlK87xzVEF4U+gSfCOP0ggUqc+YP+EDNo4Z0 TrliCjivq9VA2aY/OVMQBYAkdtEoPAqcTCHj4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JPCDjhWyTHrRtN+IrpzH/X2NJ9wHqJH6zPza8eFFddg=; b=k3XOmWDDz8aAvtocLo1AcWbve3OakX+bCdFGCSZtb7TVaS0TZ3M57dbweJGaqCOuFw icIUVfKpTmzASYVxm3Ktzeyyet7rbxRQuhdl6cCaYNvp5vaRCBQHlOOmPZ7yoxCTdTB/ Oqm7lCydR7UeMOUtDOx7NYYxX4lKVnbI+ChSNeDcV6giswfap7UD1Ti/Km8xgvGdPXPY Wt0vtWHtFvfoFf578K3C+unbHe3IuR6g3wlarE7AqRpqzB6EmrHvyifBvMLZ9VrIoTFq Px90q7ro2KRN83X67VXQhU6qkJpGAMjNFlgc06LeGFak59qZicbEBJHEINIEulAzzt2E uRtw== X-Gm-Message-State: AOAM531NRsaDyH2b47JpAgWXZB2uZ4I7PFZsvDScnCCUUkSLZOmHlfZy pVsxYU4kMweGq012JjnMJeDT7A== X-Received: by 2002:a17:902:47:: with SMTP id 65mr11879121pla.54.1591419995340; Fri, 05 Jun 2020 22:06:35 -0700 (PDT) Received: from lbrmn-lnxub113.broadcom.net ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id v8sm1057636pfn.217.2020.06.05.22.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 22:06:34 -0700 (PDT) From: Scott Branden To: Luis Chamberlain , Wolfram Sang , Greg Kroah-Hartman , David Brown , Alexander Viro , Shuah Khan , bjorn.andersson@linaro.org, Shuah Khan , Arnd Bergmann Cc: Mimi Zohar , "Rafael J . Wysocki" , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-fsdevel@vger.kernel.org, BCM Kernel Feedback , Olof Johansson , Andrew Morton , Dan Carpenter , Colin Ian King , Kees Cook , Takashi Iwai , linux-kselftest@vger.kernel.org, Andy Gross , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, Scott Branden Subject: [PATCH v7 4/8] firmware: test partial file reads of request_firmware_into_buf Date: Fri, 5 Jun 2020 22:04:54 -0700 Message-Id: <20200606050458.17281-5-scott.branden@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200606050458.17281-1-scott.branden@broadcom.com> References: <20200606050458.17281-1-scott.branden@broadcom.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add firmware tests for partial file reads of request_firmware_into_buf. Signed-off-by: Scott Branden --- .../selftests/firmware/fw_filesystem.sh | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh index fcc281373b4d..38e89ba1b4d3 100755 --- a/tools/testing/selftests/firmware/fw_filesystem.sh +++ b/tools/testing/selftests/firmware/fw_filesystem.sh @@ -149,6 +149,26 @@ config_unset_into_buf() echo 0 > $DIR/config_into_buf } +config_set_buf_size() +{ + echo $1 > $DIR/config_buf_size +} + +config_set_file_offset() +{ + echo $1 > $DIR/config_file_offset +} + +config_set_partial() +{ + echo 1 > $DIR/config_partial +} + +config_unset_partial() +{ + echo 0 > $DIR/config_partial +} + config_set_sync_direct() { echo 1 > $DIR/config_sync_direct @@ -207,6 +227,35 @@ read_firmwares() done } +read_firmwares_partial() +{ + if [ "$(cat $DIR/config_into_buf)" == "1" ]; then + fwfile="${FW_INTO_BUF}" + else + fwfile="${FW}" + fi + + if [ "$1" = "xzonly" ]; then + fwfile="${fwfile}-orig" + fi + + # Strip fwfile down to match partial offset and length + partial_data="$(cat $fwfile)" + partial_data="${partial_data:$2:$3}" + + for i in $(seq 0 3); do + config_set_read_fw_idx $i + + read_firmware="$(cat $DIR/read_firmware)" + + # Verify the contents are what we expect. + if [ $read_firmware != $partial_data ]; then + echo "request #$i: partial firmware was not loaded" >&2 + exit 1 + fi + done +} + read_firmwares_expect_nofile() { for i in $(seq 0 3); do @@ -319,6 +368,21 @@ test_batched_request_firmware_into_buf() echo "OK" } +test_batched_request_firmware_into_buf_partial() +{ + echo -n "Batched request_firmware_into_buf_partial() $2 off=$3 size=$4 try #$1: " + config_reset + config_set_name $TEST_FIRMWARE_INTO_BUF_FILENAME + config_set_into_buf + config_set_partial + config_set_buf_size $4 + config_set_file_offset $3 + config_trigger_sync + read_firmwares_partial $2 $3 $4 + release_all_firmware + echo "OK" +} + test_batched_request_firmware_direct() { echo -n "Batched request_firmware_direct() $2 try #$1: " @@ -371,6 +435,22 @@ for i in $(seq 1 5); do test_batched_request_firmware_into_buf $i normal done +for i in $(seq 1 5); do + test_batched_request_firmware_into_buf_partial $i normal 0 10 +done + +for i in $(seq 1 5); do + test_batched_request_firmware_into_buf_partial $i normal 0 5 +done + +for i in $(seq 1 5); do + test_batched_request_firmware_into_buf_partial $i normal 1 6 +done + +for i in $(seq 1 5); do + test_batched_request_firmware_into_buf_partial $i normal 2 10 +done + for i in $(seq 1 5); do test_batched_request_firmware_direct $i normal done -- 2.17.1