summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-01-11 20:51:31 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-01-21 04:08:38 +0100
commit7f32c9c60089bfdb5eeeaae6e9f59046db998234 (patch)
treeaddedd0786354bcebbc5f391d2900fac98339407 /arch/powerpc
parentpowerpc: Fix corruption when grabbing FWNMI data (diff)
downloadlinux-7f32c9c60089bfdb5eeeaae6e9f59046db998234.tar.xz
linux-7f32c9c60089bfdb5eeeaae6e9f59046db998234.zip
powerpc: Check RTAS extended log flag before checking length
The spec suggests we should first check the extended log flag before checking the length field. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/rtasd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 0438f819fe6b..049dbecb5dbc 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -160,7 +160,7 @@ static int log_rtas_len(char * buf)
/* rtas fixed header */
len = 8;
err = (struct rtas_error_log *)buf;
- if (err->extended_log_length) {
+ if (err->extended && err->extended_log_length) {
/* extended header */
len += err->extended_log_length;