puzzles: Refresh patches based upon upstream discussion

I mentioned these patches to upstream and this cleans them up based upon
our discussion with better fixes, fixed comments and tracking down the correct
issue in the malloc case.

If we can test and confirm them in this form, we should be in a good position
to resovle the issues with upstream and be able to drop the patches ultimately.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>