Merge pull request #388 from nchong/fix369

AlessandroA · web-flow · commit c6e5160b52ee · 2017-02-08T19:35:54.000Z
Fix out-by-one error in vmpu_mpu_push
diff --git a/core/vmpu/src/armv7m/vmpu_armv7m_mpu.c b/core/vmpu/src/armv7m/vmpu_armv7m_mpu.c
@@ -411,7 +411,7 @@ bool vmpu_mpu_push(const MpuRegion * const region, uint8_t priority)
     uint8_t viable_slot = start_slot;
 
     do {
-        if (++g_mpu_slot > ARMv7M_MPU_REGIONS_MAX) {
+        if (++g_mpu_slot >= ARMv7M_MPU_REGIONS_MAX) {
             g_mpu_slot = ARMv7M_MPU_REGIONS_STATIC;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ bool vmpu_mpu_push(const MpuRegion * const region, uint8_t priority)`
`411`	`411`	`uint8_t viable_slot = start_slot;`
`412`	`412`
`413`	`413`	`do {`
`414`		`- if (++g_mpu_slot > ARMv7M_MPU_REGIONS_MAX) {`
	`414`	`+ if (++g_mpu_slot >= ARMv7M_MPU_REGIONS_MAX) {`
`415`	`415`	`g_mpu_slot = ARMv7M_MPU_REGIONS_STATIC;`
`416`	`416`	`}`
`417`	`417`