63c3424617
openeuler !302!305 e1000-fail-early-for-evil-descriptor.patch e1000-fix-tx-re-entrancy-problem.patch hw-sd-sdcard-Restrict-Class-6-commands-to-SCSD-cards.patch hw-sd-sdcard-Simplify-realize-a-bit.patch hw-sd-sdcard-Do-not-allow-invalid-SD-card-sizes.patch hw-sd-sdcard-Update-coding-style-to-make-checkpatch..patch hw-sd-sdcard-Do-not-switch-to-ReceivingData-if-addre.patch scsi-qemu-pr-helper-Fix-out-of-bounds-access-to-trnp.patch curses-Fixes-curses-compiling-errors.patch net-dump.c-Suppress-spurious-compiler-warning.patch tests-Replace-deprecated-ASN1-code.patch
88 lines
3.0 KiB
Diff
88 lines
3.0 KiB
Diff
From 29a65998b9c0e22983d6861efabae88106af591b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
|
|
Date: Mon, 13 Jul 2020 09:27:35 +0200
|
|
Subject: [PATCH 6/7] hw/sd/sdcard: Update coding style to make checkpatch.pl
|
|
happy
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
To make the next commit easier to review, clean this code first.
|
|
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
|
|
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
|
|
Message-Id: <20200630133912.9428-3-f4bug@amsat.org>
|
|
---
|
|
hw/sd/sd.c | 24 ++++++++++++++++--------
|
|
1 file changed, 16 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
|
|
index 263072a353..ed796fb41f 100644
|
|
--- a/hw/sd/sd.c
|
|
+++ b/hw/sd/sd.c
|
|
@@ -1160,8 +1160,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
|
|
sd->data_start = addr;
|
|
sd->data_offset = 0;
|
|
|
|
- if (sd->data_start + sd->blk_len > sd->size)
|
|
+ if (sd->data_start + sd->blk_len > sd->size) {
|
|
sd->card_status |= ADDRESS_ERROR;
|
|
+ }
|
|
return sd_r1;
|
|
|
|
default:
|
|
@@ -1176,8 +1177,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
|
|
sd->data_start = addr;
|
|
sd->data_offset = 0;
|
|
|
|
- if (sd->data_start + sd->blk_len > sd->size)
|
|
+ if (sd->data_start + sd->blk_len > sd->size) {
|
|
sd->card_status |= ADDRESS_ERROR;
|
|
+ }
|
|
return sd_r1;
|
|
|
|
default:
|
|
@@ -1222,12 +1224,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
|
|
sd->data_offset = 0;
|
|
sd->blk_written = 0;
|
|
|
|
- if (sd->data_start + sd->blk_len > sd->size)
|
|
+ if (sd->data_start + sd->blk_len > sd->size) {
|
|
sd->card_status |= ADDRESS_ERROR;
|
|
- if (sd_wp_addr(sd, sd->data_start))
|
|
+ }
|
|
+ if (sd_wp_addr(sd, sd->data_start)) {
|
|
sd->card_status |= WP_VIOLATION;
|
|
- if (sd->csd[14] & 0x30)
|
|
+ }
|
|
+ if (sd->csd[14] & 0x30) {
|
|
sd->card_status |= WP_VIOLATION;
|
|
+ }
|
|
return sd_r1;
|
|
|
|
default:
|
|
@@ -1246,12 +1251,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
|
|
sd->data_offset = 0;
|
|
sd->blk_written = 0;
|
|
|
|
- if (sd->data_start + sd->blk_len > sd->size)
|
|
+ if (sd->data_start + sd->blk_len > sd->size) {
|
|
sd->card_status |= ADDRESS_ERROR;
|
|
- if (sd_wp_addr(sd, sd->data_start))
|
|
+ }
|
|
+ if (sd_wp_addr(sd, sd->data_start)) {
|
|
sd->card_status |= WP_VIOLATION;
|
|
- if (sd->csd[14] & 0x30)
|
|
+ }
|
|
+ if (sd->csd[14] & 0x30) {
|
|
sd->card_status |= WP_VIOLATION;
|
|
+ }
|
|
return sd_r1;
|
|
|
|
default:
|
|
--
|
|
2.17.1
|
|
|