Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83383b73 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Benjamin Herrenschmidt
Browse files

powerpc/mm: Fix fallthrough bug in hpte_decode 



We should not fallthrough different case statements in hpte_decode. Add
break statement to break out of the switch. The regression is introduced by
dcda287a "powerpc/mm: Simplify hpte_decode"

Reported-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent ad92c615

arch/powerpc/mm/hash_native_64.c

+2 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot, 
			seg_off |= vpi << shift;

		}

		*vpn = vsid << (SID_SHIFT - VPN_SHIFT) | seg_off >> VPN_SHIFT;

		break;

	case MMU_SEGSIZE_1T:

		/* We only have 40 - 23 bits of seg_off in avpn */

		seg_off = (avpn & 0x1ffff) << 23;
@@ -563,6 +564,7 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot, 
			seg_off |= vpi << shift;

		}

		*vpn = vsid << (SID_SHIFT_1T - VPN_SHIFT) | seg_off >> VPN_SHIFT;

		break;

	default:

		*vpn = size = 0;

	}