From dae378cdc26b5390d0473ac40e0c11f8707f0203 Mon Sep 17 00:00:00 2001 From: "brking@us.ibm.com" Date: Tue, 1 Nov 2005 17:00:47 -0600 Subject: [PATCH] --- yaml --- r: 13923 b: refs/heads/master c: cf8520376c2b752237095f6cd279e5443bd2fffe h: refs/heads/master i: 13921: c5fd6eb286682603efc4a7075ba724994d813dc8 13919: f1ef370cbae80975f75cc57d1522dbda15f8f332 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c42999f5378d..b2b5ea7e7bab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9cfca9622d660daf9422c2f041828e017eba58b +refs/heads/master: cf8520376c2b752237095f6cd279e5443bd2fffe diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index 40763b64e9eb..b5a2669518ba 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -1141,11 +1141,10 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg, if (ioa_cfg->log_level < IPR_DEFAULT_LOG_LEVEL) return; + if (be32_to_cpu(hostrcb->hcam.length) > sizeof(hostrcb->hcam.u.raw)) + hostrcb->hcam.length = cpu_to_be32(sizeof(hostrcb->hcam.u.raw)); switch (hostrcb->hcam.overlay_id) { - case IPR_HOST_RCB_OVERLAY_ID_1: - ipr_log_generic_error(ioa_cfg, hostrcb); - break; case IPR_HOST_RCB_OVERLAY_ID_2: ipr_log_cache_error(ioa_cfg, hostrcb); break; @@ -1156,6 +1155,7 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg, case IPR_HOST_RCB_OVERLAY_ID_6: ipr_log_array_error(ioa_cfg, hostrcb); break; + case IPR_HOST_RCB_OVERLAY_ID_1: case IPR_HOST_RCB_OVERLAY_ID_DEFAULT: default: ipr_log_generic_error(ioa_cfg, hostrcb);