| Message ID | 1515669145-125352-1-git-send-email-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 01/11/2018 05:12 AM, Wei Yongjun wrote: > Fix to return error code -ENOMEM from the kzalloc() error handling > case instead of 0, as done elsewhere in this function. > > Fixes: fabe6a59cc5a ("tcmu: allow max block and global max blocks to be settable") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/target/target_core_user.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > index bac08bc..2edd242 100644 > --- a/drivers/target/target_core_user.c > +++ b/drivers/target/target_core_user.c > @@ -1705,8 +1705,10 @@ static int tcmu_configure_device(struct se_device *dev) > > udev->data_bitmap = kzalloc(BITS_TO_LONGS(udev->max_blocks) * > sizeof(unsigned long), GFP_KERNEL); > - if (!udev->data_bitmap) > + if (!udev->data_bitmap) { > + ret = -ENOMEM; > goto err_bitmap_alloc; > + } > > udev->mb_addr = vzalloc(CMDR_SIZE); > if (!udev->mb_addr) { > Thanks. Acked-by: Mike Christie <mchristi@redhat.com>
On Thu, 2018-01-11 at 11:10 -0600, Mike Christie wrote: > On 01/11/2018 05:12 AM, Wei Yongjun wrote: > > Fix to return error code -ENOMEM from the kzalloc() error handling > > case instead of 0, as done elsewhere in this function. > > > > Fixes: fabe6a59cc5a ("tcmu: allow max block and global max blocks to be settable") > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > > --- > > drivers/target/target_core_user.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > > index bac08bc..2edd242 100644 > > --- a/drivers/target/target_core_user.c > > +++ b/drivers/target/target_core_user.c > > @@ -1705,8 +1705,10 @@ static int tcmu_configure_device(struct se_device *dev) > > > > udev->data_bitmap = kzalloc(BITS_TO_LONGS(udev->max_blocks) * > > sizeof(unsigned long), GFP_KERNEL); > > - if (!udev->data_bitmap) > > + if (!udev->data_bitmap) { > > + ret = -ENOMEM; > > goto err_bitmap_alloc; > > + } > > > > udev->mb_addr = vzalloc(CMDR_SIZE); > > if (!udev->mb_addr) { > > > > Thanks. > > Acked-by: Mike Christie <mchristi@redhat.com> Applied. Thanks Wei + MNC.
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c index bac08bc..2edd242 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c @@ -1705,8 +1705,10 @@ static int tcmu_configure_device(struct se_device *dev) udev->data_bitmap = kzalloc(BITS_TO_LONGS(udev->max_blocks) * sizeof(unsigned long), GFP_KERNEL); - if (!udev->data_bitmap) + if (!udev->data_bitmap) { + ret = -ENOMEM; goto err_bitmap_alloc; + } udev->mb_addr = vzalloc(CMDR_SIZE); if (!udev->mb_addr) {
Fix to return error code -ENOMEM from the kzalloc() error handling case instead of 0, as done elsewhere in this function. Fixes: fabe6a59cc5a ("tcmu: allow max block and global max blocks to be settable") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/target/target_core_user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)