This partially reverts commit 6a9b3f0f3bad4ca6421f8c20e1dde9839699db0f. The upstream commit addresses multiple verifier changes, only one of which was backported to v5.4. Therefore only keep the relevant changes and revert the others. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>