Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
f04ecee9
Commit
f04ecee9
authored
7 years ago
by
Vincent Dupont
Browse files
Options
Downloads
Patches
Plain Diff
mtd_native: fix overlapping pages write check
parent
b6fe1368
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cpu/native/mtd/mtd_native.c
+2
-3
2 additions, 3 deletions
cpu/native/mtd/mtd_native.c
tests/unittests/tests-mtd/tests-mtd.c
+13
-1
13 additions, 1 deletion
tests/unittests/tests-mtd/tests-mtd.c
with
15 additions
and
4 deletions
cpu/native/mtd/mtd_native.c
+
2
−
3
View file @
f04ecee9
...
@@ -79,14 +79,13 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size
...
@@ -79,14 +79,13 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size
{
{
mtd_native_dev_t
*
_dev
=
(
mtd_native_dev_t
*
)
dev
;
mtd_native_dev_t
*
_dev
=
(
mtd_native_dev_t
*
)
dev
;
size_t
mtd_size
=
dev
->
sector_count
*
dev
->
pages_per_sector
*
dev
->
page_size
;
size_t
mtd_size
=
dev
->
sector_count
*
dev
->
pages_per_sector
*
dev
->
page_size
;
size_t
sector_size
=
dev
->
pages_per_sector
*
dev
->
page_size
;
DEBUG
(
"mtd_native: write from
page
%"
PRI
u
32
" count %"
PRIu32
"
\n
"
,
addr
,
size
);
DEBUG
(
"mtd_native: write from
0x
%"
PRI
x
32
" count %"
PRIu32
"
\n
"
,
addr
,
size
);
if
(
addr
+
size
>
mtd_size
)
{
if
(
addr
+
size
>
mtd_size
)
{
return
-
EOVERFLOW
;
return
-
EOVERFLOW
;
}
}
if
(((
addr
%
sector
_size
)
+
size
)
>
sector
_size
)
{
if
(((
addr
%
dev
->
page
_size
)
+
size
)
>
dev
->
page
_size
)
{
return
-
EOVERFLOW
;
return
-
EOVERFLOW
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tests/unittests/tests-mtd/tests-mtd.c
+
13
−
1
View file @
f04ecee9
...
@@ -69,7 +69,7 @@ static int write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size)
...
@@ -69,7 +69,7 @@ static int write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size)
if
(
addr
+
size
>
sizeof
(
dummy_memory
))
{
if
(
addr
+
size
>
sizeof
(
dummy_memory
))
{
return
-
EOVERFLOW
;
return
-
EOVERFLOW
;
}
}
if
(
size
>
PAGE_SIZE
)
{
if
(
((
addr
%
PAGE_SIZE
)
+
size
)
>
PAGE_SIZE
)
{
return
-
EOVERFLOW
;
return
-
EOVERFLOW
;
}
}
memcpy
(
dummy_memory
+
addr
,
buff
,
size
);
memcpy
(
dummy_memory
+
addr
,
buff
,
size
);
...
@@ -212,6 +212,18 @@ static void test_mtd_write_read(void)
...
@@ -212,6 +212,18 @@ static void test_mtd_write_read(void)
ret
=
mtd_write
(
dev
,
buf
,
(
dev
->
pages_per_sector
*
dev
->
page_size
*
dev
->
sector_count
)
ret
=
mtd_write
(
dev
,
buf
,
(
dev
->
pages_per_sector
*
dev
->
page_size
*
dev
->
sector_count
)
-
(
sizeof
(
buf
)
/
2
),
sizeof
(
buf
));
-
(
sizeof
(
buf
)
/
2
),
sizeof
(
buf
));
TEST_ASSERT_EQUAL_INT
(
-
EOVERFLOW
,
ret
);
TEST_ASSERT_EQUAL_INT
(
-
EOVERFLOW
,
ret
);
/* out of bounds write (more than page size) */
const
size_t
page_size
=
dev
->
page_size
;
const
uint8_t
buf_page
[
page_size
+
1
];
ret
=
mtd_write
(
dev
,
buf_page
,
0
,
sizeof
(
buf_page
));
TEST_ASSERT_EQUAL_INT
(
-
EOVERFLOW
,
ret
);
/* pages overlap write */
ret
=
mtd_write
(
dev
,
buf
,
dev
->
page_size
-
(
sizeof
(
buf
)
/
2
),
sizeof
(
buf
));
TEST_ASSERT_EQUAL_INT
(
-
EOVERFLOW
,
ret
);
ret
=
mtd_write
(
dev
,
buf_page
,
1
,
sizeof
(
buf_page
)
-
1
);
TEST_ASSERT_EQUAL_INT
(
-
EOVERFLOW
,
ret
);
}
}
#ifdef MTD_0
#ifdef MTD_0
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment