diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /fs/proc/kcore.c | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/proc/kcore.c')
| -rw-r--r-- | fs/proc/kcore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 3ceff3857272..1294eda4acae 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
| @@ -100,7 +100,7 @@ static int notesize(struct memelfnote *en) | |||
| 100 | int sz; | 100 | int sz; |
| 101 | 101 | ||
| 102 | sz = sizeof(struct elf_note); | 102 | sz = sizeof(struct elf_note); |
| 103 | sz += roundup(strlen(en->name), 4); | 103 | sz += roundup((strlen(en->name) + 1), 4); |
| 104 | sz += roundup(en->datasz, 4); | 104 | sz += roundup(en->datasz, 4); |
| 105 | 105 | ||
| 106 | return sz; | 106 | return sz; |
| @@ -116,7 +116,7 @@ static char *storenote(struct memelfnote *men, char *bufp) | |||
| 116 | 116 | ||
| 117 | #define DUMP_WRITE(addr,nr) do { memcpy(bufp,addr,nr); bufp += nr; } while(0) | 117 | #define DUMP_WRITE(addr,nr) do { memcpy(bufp,addr,nr); bufp += nr; } while(0) |
| 118 | 118 | ||
| 119 | en.n_namesz = strlen(men->name); | 119 | en.n_namesz = strlen(men->name) + 1; |
| 120 | en.n_descsz = men->datasz; | 120 | en.n_descsz = men->datasz; |
| 121 | en.n_type = men->type; | 121 | en.n_type = men->type; |
| 122 | 122 | ||