Fix bug in adaption of Stefano Babic's CFI driver patch.