Two patches fixing problems introduced with copy_from_user changes