From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45572 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753713AbcDIXpu (ORCPT ); Sat, 9 Apr 2016 19:45:50 -0400 Subject: Patch "dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()" has been added to the 4.5-stable tree To: bmr@redhat.com, gregkh@linuxfoundation.org, snitzer@redhat.com Cc: , From: Date: Sat, 09 Apr 2016 16:45:48 -0700 Message-ID: <1460245548370@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request() to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: dm-fix-rq_end_stats-null-pointer-in-dm_requeue_original_request.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 98dbc9c6c61698792e3a66f32f3bf066201d42d7 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Mon, 14 Mar 2016 17:04:34 -0400 Subject: dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request() From: Bryn M. Reeves commit 98dbc9c6c61698792e3a66f32f3bf066201d42d7 upstream. An "old" (.request_fn) DM 'struct request' stores a pointer to the associated 'struct dm_rq_target_io' in rq->special. dm_requeue_original_request(), previously named dm_requeue_unmapped_original_request(), called dm_unprep_request() to reset rq->special to NULL. But rq_end_stats() would go on to hit a NULL pointer deference because its call to tio_from_request() returned NULL. Fix this by calling rq_end_stats() _before_ dm_unprep_request() Signed-off-by: Bryn M. Reeves Signed-off-by: Mike Snitzer Fixes: e262f34741 ("dm stats: add support for request-based DM devices") Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1210,9 +1210,9 @@ static void dm_requeue_original_request( { int rw = rq_data_dir(rq); + rq_end_stats(md, rq); dm_unprep_request(rq); - rq_end_stats(md, rq); if (!rq->q->mq_ops) old_requeue_request(rq); else { Patches currently in stable-queue which might be from bmr@redhat.com are queue-4.5/dm-fix-rq_end_stats-null-pointer-in-dm_requeue_original_request.patch