aboutsummaryrefslogtreecommitdiffstats
path: root/fs/afs
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2012-03-16 10:28:07 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-23 11:20:51 -0700
commit4376d0751532595d76d8dbe9a7ddb6d92f08ff82 (patch)
tree674b0ed19043b3dab9dfc52d3a8be2a3036b0284 /fs/afs
parentf4565db7fa0694572ac50b8615c7ac3dc936e012 (diff)
downloadkernel_samsung_smdk4412-4376d0751532595d76d8dbe9a7ddb6d92f08ff82.zip
kernel_samsung_smdk4412-4376d0751532595d76d8dbe9a7ddb6d92f08ff82.tar.gz
kernel_samsung_smdk4412-4376d0751532595d76d8dbe9a7ddb6d92f08ff82.tar.bz2
afs: Read of file returns EBADMSG
commit 2c724fb92732c0b2a5629eb8af74e82eb62ac947 upstream. A read of a large file on an afs mount failed: # cat junk.file > /dev/null cat: junk.file: Bad message Looking at the trace, call->offset wrapped since it is only an unsigned short. In afs_extract_data: _enter("{%u},{%zu},%d,,%zu", call->offset, len, last, count); ... if (call->offset < count) { if (last) { _leave(" = -EBADMSG [%d < %zu]", call->offset, count); return -EBADMSG; } Which matches the trace: [cat ] ==> afs_extract_data({65132},{524},1,,65536) [cat ] <== afs_extract_data() = -EBADMSG [0 < 65536] call->offset went from 65132 to 0. Fix this by making call->offset an unsigned int. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/afs')
-rw-r--r--fs/afs/internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 5a9b684..1f3624d 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -109,7 +109,7 @@ struct afs_call {
unsigned reply_size; /* current size of reply */
unsigned first_offset; /* offset into mapping[first] */
unsigned last_to; /* amount of mapping[last] */
- unsigned short offset; /* offset into received data store */
+ unsigned offset; /* offset into received data store */
unsigned char unmarshall; /* unmarshalling phase */
bool incoming; /* T if incoming call */
bool send_pages; /* T if data from mapping should be sent */