summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-26 19:12:30 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-26 19:12:30 +0000
commitb82a189c4e852d0f88a591aa8d7d28fda1387743 (patch)
tree421dfd15f53bb3968b49e1e25b7c657b72ca4997
parent53590217eee6106782b2bb85ed334adf7c5e68c1 (diff)
downloadopenocd+libswd-b82a189c4e852d0f88a591aa8d7d28fda1387743.tar.gz
openocd+libswd-b82a189c4e852d0f88a591aa8d7d28fda1387743.tar.bz2
openocd+libswd-b82a189c4e852d0f88a591aa8d7d28fda1387743.tar.xz
openocd+libswd-b82a189c4e852d0f88a591aa8d7d28fda1387743.zip
add check for target_read/write_buffer 32 bit wrap.
git-svn-id: svn://svn.berlios.de/openocd/trunk@875 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/target/target.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 58a940bd..7c6beb0f 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -969,13 +969,20 @@ int target_arch_state(struct target_s *target)
int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer)
{
int retval;
+ LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address);
+
if (!target->type->examined)
{
LOG_ERROR("Target not examined yet");
return ERROR_FAIL;
}
- LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address);
+ if (address+size<address)
+ {
+ /* GDB can request this when e.g. PC is 0xfffffffc*/
+ LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", address, size);
+ return ERROR_FAIL;
+ }
if (((address % 2) == 0) && (size == 2))
{
@@ -1038,13 +1045,20 @@ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buff
int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer)
{
int retval;
+ LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address);
+
if (!target->type->examined)
{
LOG_ERROR("Target not examined yet");
return ERROR_FAIL;
}
-
- LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address);
+
+ if (address+size<address)
+ {
+ /* GDB can request this when e.g. PC is 0xfffffffc*/
+ LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", address, size);
+ return ERROR_FAIL;
+ }
if (((address % 2) == 0) && (size == 2))
{