[PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Chen Gang]

  if call xen_vbd_translate failed, the preq.dev will be not initialized.
  so use blkif->vbd.pdevice instead (still better to print relative info).

additional information:
  before commit 01c681d4c70d64cb72142a2823f27c4146a02e63, the value printed
  here was bogus, as it was the guest provided value from req->u.rw.handle
  rather than the actual device.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Acked-by: Jan Beulich <JBeulich@suse.com>
---
 drivers/block/xen-blkback/blkback.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index de1f319..6d1cc3d 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -904,7 +904,8 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
 		pr_debug(DRV_PFX "access denied: %s of [%llu,%llu] on dev=%04x\n",
 			 operation == READ ? "read" : "write",
 			 preq.sector_number,
-			 preq.sector_number + preq.nr_sects, preq.dev);
+			 preq.sector_number + preq.nr_sects,
+			 blkif->vbd.pdevice);
 		goto fail_response;
 	}
 
-- 
1.7.7.6

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Konrad Rzeszutek Wilk]

On Thu, Feb 28, 2013 at 10:34:23AM +0800, Chen Gang wrote:
> 
>   if call xen_vbd_translate failed, the preq.dev will be not initialized.
>   so use blkif->vbd.pdevice instead (still better to print relative info).
> 
> additional information:
>   before commit 01c681d4c70d64cb72142a2823f27c4146a02e63, the value printed
>   here was bogus, as it was the guest provided value from req->u.rw.handle
>   rather than the actual device.

applied with some changes to the description.

> 
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> Acked-by: Jan Beulich <JBeulich@suse.com>
> ---
>  drivers/block/xen-blkback/blkback.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
> index de1f319..6d1cc3d 100644
> --- a/drivers/block/xen-blkback/blkback.c
> +++ b/drivers/block/xen-blkback/blkback.c
> @@ -904,7 +904,8 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
>  		pr_debug(DRV_PFX "access denied: %s of [%llu,%llu] on dev=%04x\n",
>  			 operation == READ ? "read" : "write",
>  			 preq.sector_number,
> -			 preq.sector_number + preq.nr_sects, preq.dev);
> +			 preq.sector_number + preq.nr_sects,
> +			 blkif->vbd.pdevice);
>  		goto fail_response;
>  	}
>  
> -- 
> 1.7.7.6

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Chen Gang]

于 2013年03月01日 21:43, Konrad Rzeszutek Wilk 写道:
> On Thu, Feb 28, 2013 at 10:34:23AM +0800, Chen Gang wrote:
>>
>>   if call xen_vbd_translate failed, the preq.dev will be not initialized.
>>   so use blkif->vbd.pdevice instead (still better to print relative info).
>>
>> additional information:
>>   before commit 01c681d4c70d64cb72142a2823f27c4146a02e63, the value printed
>>   here was bogus, as it was the guest provided value from req->u.rw.handle
>>   rather than the actual device.
> 
> applied with some changes to the description.
> 

  thanks.

>>
>> Signed-off-by: Chen Gang <gang.chen@asianux.com>
>> Acked-by: Jan Beulich <JBeulich@suse.com>
>> ---
>>  drivers/block/xen-blkback/blkback.c |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
>> index de1f319..6d1cc3d 100644
>> --- a/drivers/block/xen-blkback/blkback.c
>> +++ b/drivers/block/xen-blkback/blkback.c
>> @@ -904,7 +904,8 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
>>  		pr_debug(DRV_PFX "access denied: %s of [%llu,%llu] on dev=%04x\n",
>>  			 operation == READ ? "read" : "write",
>>  			 preq.sector_number,
>> -			 preq.sector_number + preq.nr_sects, preq.dev);
>> +			 preq.sector_number + preq.nr_sects,
>> +			 blkif->vbd.pdevice);
>>  		goto fail_response;
>>  	}
>>  
>> -- 
>> 1.7.7.6
> 
> 


-- 
Chen Gang

Asianux Corporation

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[William Dauchy]

Hello,

On Thu, Feb 28, 2013 at 3:34 AM, Chen Gang <gang.chen@asianux.com> wrote:
> additional information:
>   before commit 01c681d4c70d64cb72142a2823f27c4146a02e63, the value printed
>   here was bogus, as it was the guest provided value from req->u.rw.handle
>   rather than the actual device.
>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> Acked-by: Jan Beulich <JBeulich@suse.com>

Sorry I'm a bit late but since since 01c681d is in stable, I guess
a72d900 (xen/xen-blkback: preq.dev is used without initialized)
could be added in stable as well.
Am I wrong? otherwise I'm ok to do the request.

Regards,

--
William

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Jan Beulich]

>>> On 03.04.13 at 14:56, William Dauchy <wdauchy@gmail.com> wrote:
> On Thu, Feb 28, 2013 at 3:34 AM, Chen Gang <gang.chen@asianux.com> wrote:
>> additional information:
>>   before commit 01c681d4c70d64cb72142a2823f27c4146a02e63, the value printed
>>   here was bogus, as it was the guest provided value from req->u.rw.handle
>>   rather than the actual device.
>>
>> Signed-off-by: Chen Gang <gang.chen@asianux.com>
>> Acked-by: Jan Beulich <JBeulich@suse.com>
> 
> Sorry I'm a bit late but since since 01c681d is in stable, I guess
> a72d900 (xen/xen-blkback: preq.dev is used without initialized)
> could be added in stable as well.
> Am I wrong? otherwise I'm ok to do the request.

Iirc we requested the earlier commit to be removed from stable
trees, and I think Greg also did so.

Jan

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[William Dauchy]

Hello Jan,

On Wed, Apr 3, 2013 at 3:01 PM, Jan Beulich <JBeulich@suse.com> wrote:
> Iirc we requested the earlier commit to be removed from stable
> trees, and I think Greg also did so.

I'm sorry but I'm unable to find a revert of 01c681d in stable tree.

Regards,
--
William

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Jan Beulich]

>>> On 03.04.13 at 15:25, William Dauchy <wdauchy@gmail.com> wrote:
> On Wed, Apr 3, 2013 at 3:01 PM, Jan Beulich <JBeulich@suse.com> wrote:
>> Iirc we requested the earlier commit to be removed from stable
>> trees, and I think Greg also did so.
> 
> I'm sorry but I'm unable to find a revert of 01c681d in stable tree.

ChangeLog-3.8.3 for example has

commit 32f4d10ed8fd7ef4cebbf02c5326e8bb6aeca9b1
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Tue Mar 12 15:08:26 2013 -0700

    Revert "xen/blkback: Don't trust the handle from the frontend."
    
    This reverts commit 01c681d4c70d64cb72142a2823f27c4146a02e63 upstream
    (ef56ca64ea733c3b88f0bb74b04da128b1dc35d8 in this tree), as it wasn't
    supposed to have been applied to the stable tree.
    
    Cc: Jan Beulich <jbeulich@suse.com>
    Cc: Ian Campbell <ian.campbell@citrix.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


Jan

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[William Dauchy]

On Wed, Apr 3, 2013 at 3:42 PM, Jan Beulich <JBeulich@suse.com> wrote:
> ChangeLog-3.8.3 for example has

oh sorry, you are right. I wasn't looking is the 3.8.x branch.
The thing is, the revert seems present only in 3.8.x branch. For
example in 3.4.x the last patch is still 01c681d
Should we consider this normal or is it a mistake?

--
William

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Jan Beulich]

>>> On 03.04.13 at 15:56, William Dauchy <wdauchy@gmail.com> wrote:
> On Wed, Apr 3, 2013 at 3:42 PM, Jan Beulich <JBeulich@suse.com> wrote:
>> ChangeLog-3.8.3 for example has
> 
> oh sorry, you are right. I wasn't looking is the 3.8.x branch.
> The thing is, the revert seems present only in 3.8.x branch. For
> example in 3.4.x the last patch is still 01c681d
> Should we consider this normal or is it a mistake?

I think it is a mistake, but ultimately it's Konrad's call.

Jan

Re: [PATCH v2] drivers/block/xen-blkback: preq.dev is used without initialized

[Konrad Rzeszutek Wilk]

On Wed, Apr 03, 2013 at 03:34:16PM +0100, Jan Beulich wrote:
> >>> On 03.04.13 at 15:56, William Dauchy <wdauchy@gmail.com> wrote:
> > On Wed, Apr 3, 2013 at 3:42 PM, Jan Beulich <JBeulich@suse.com> wrote:
> >> ChangeLog-3.8.3 for example has
> > 
> > oh sorry, you are right. I wasn't looking is the 3.8.x branch.
> > The thing is, the revert seems present only in 3.8.x branch. For
> > example in 3.4.x the last patch is still 01c681d
> > Should we consider this normal or is it a mistake?
> 
> I think it is a mistake, but ultimately it's Konrad's call.

It is a mistake. Please revert it if possible.
> 
> Jan
>