| Message ID | 20190904083315.105600-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] vfio-ccw: fix error return code in vfio_ccw_sch_init() | expand |
On Wed, 4 Sep 2019 08:33:15 +0000 Wei Yongjun <weiyongjun1@huawei.com> wrote: > Fix to return negative error code -ENOMEM from the memory alloc failed > error handling case instead of 0, as done elsewhere in this function. > > Fixes: 60e05d1cf087 ("vfio-ccw: add some logging") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/s390/cio/vfio_ccw_drv.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) Ah, yes. Reviewed-by: Cornelia Huck <cohuck@redhat.com> Heiko/Vasily/Christian: can you queue this directly?
On 04.09.19 10:33, Wei Yongjun wrote: > Fix to return negative error code -ENOMEM from the memory alloc failed > error handling case instead of 0, as done elsewhere in this function. > > Fixes: 60e05d1cf087 ("vfio-ccw: add some logging") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> thanks applied to s390 tree. > --- > drivers/s390/cio/vfio_ccw_drv.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c > index 45e792f6afd0..e401a3d0aa57 100644 > --- a/drivers/s390/cio/vfio_ccw_drv.c > +++ b/drivers/s390/cio/vfio_ccw_drv.c > @@ -317,15 +317,19 @@ static int __init vfio_ccw_sch_init(void) > sizeof(struct ccw_io_region), 0, > SLAB_ACCOUNT, 0, > sizeof(struct ccw_io_region), NULL); > - if (!vfio_ccw_io_region) > + if (!vfio_ccw_io_region) { > + ret = -ENOMEM; > goto out_err; > + } > > vfio_ccw_cmd_region = kmem_cache_create_usercopy("vfio_ccw_cmd_region", > sizeof(struct ccw_cmd_region), 0, > SLAB_ACCOUNT, 0, > sizeof(struct ccw_cmd_region), NULL); > - if (!vfio_ccw_cmd_region) > + if (!vfio_ccw_cmd_region) { > + ret = -ENOMEM; > goto out_err; > + } > > isc_register(VFIO_CCW_ISC); > ret = css_driver_register(&vfio_ccw_sch_driver); > > >
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c index 45e792f6afd0..e401a3d0aa57 100644 --- a/drivers/s390/cio/vfio_ccw_drv.c +++ b/drivers/s390/cio/vfio_ccw_drv.c @@ -317,15 +317,19 @@ static int __init vfio_ccw_sch_init(void) sizeof(struct ccw_io_region), 0, SLAB_ACCOUNT, 0, sizeof(struct ccw_io_region), NULL); - if (!vfio_ccw_io_region) + if (!vfio_ccw_io_region) { + ret = -ENOMEM; goto out_err; + } vfio_ccw_cmd_region = kmem_cache_create_usercopy("vfio_ccw_cmd_region", sizeof(struct ccw_cmd_region), 0, SLAB_ACCOUNT, 0, sizeof(struct ccw_cmd_region), NULL); - if (!vfio_ccw_cmd_region) + if (!vfio_ccw_cmd_region) { + ret = -ENOMEM; goto out_err; + } isc_register(VFIO_CCW_ISC); ret = css_driver_register(&vfio_ccw_sch_driver);
Fix to return negative error code -ENOMEM from the memory alloc failed error handling case instead of 0, as done elsewhere in this function. Fixes: 60e05d1cf087 ("vfio-ccw: add some logging") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/s390/cio/vfio_ccw_drv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)