Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 801a76050bcf8d4e500eb8d048ff6265f37a61c8

Authored by Al Viro
Committed by Linus Torvalds
1 parent 27b5c3f3cc
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

seq_file: always clear m->count when we free m->buf 

Once we'd freed m->buf, m->count should become zero - we have no valid
contents reachable via m->buf.

Reported-by: Charley (Hao Chuan) Chu <charley.chu@broadcom.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -136,6 +136,7 @@
136 136 Eoverflow:
137 137 m->op->stop(m, p);
138 138 kfree(m->buf);
  139 + m->count = 0;
139 140 m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
140 141 return !m->buf ? -ENOMEM : -EAGAIN;
141 142 }
142 143  
... ... @@ -232,10 +233,10 @@
232 233 goto Fill;
233 234 m->op->stop(m, p);
234 235 kfree(m->buf);
  236 + m->count = 0;
235 237 m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
236 238 if (!m->buf)
237 239 goto Enomem;
238   - m->count = 0;
239 240 m->version = 0;
240 241 pos = m->index;
241 242 p = m->op->start(m, &pos);