diff options
| author | Paolo 'Blaisorblade' Giarrusso | 2005-05-16 21:53:14 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-05-17 07:59:11 -0700 |
| commit | 8f332287bc3f2801ba43682fd79baf24dc8ac1ce (patch) | |
| tree | 23644cbab8be5b6f6d3b69d2ef221aecf679fd72 /arch/um/kernel | |
| parent | 02048817a70ad04dda5b30ad876c42a232229c99 (diff) | |
[PATCH] uml: change memcpy to memmove
Replace one memcpy() call with overlapping source and dest arguments with
one call to memmove(), to avoid data corruption.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/irq_user.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/um/kernel/irq_user.c b/arch/um/kernel/irq_user.c index 6d6f9484b884..b3074cbaa479 100644 --- a/arch/um/kernel/irq_user.c +++ b/arch/um/kernel/irq_user.c @@ -236,9 +236,15 @@ static void free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg) (*prev)->fd, pollfds[i].fd); goto out; } - memcpy(&pollfds[i], &pollfds[i + 1], - (pollfds_num - i - 1) * sizeof(pollfds[0])); + pollfds_num--; + + /* This moves the *whole* array after pollfds[i] (though + * it doesn't spot as such)! */ + + memmove(&pollfds[i], &pollfds[i + 1], + (pollfds_num - i) * sizeof(pollfds[0])); + if(last_irq_ptr == &old_fd->next) last_irq_ptr = prev; *prev = (*prev)->next; |