| Message ID | 20210806085413.61536-2-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Fri, Aug 6, 2021 at 5:14 PM Sergey Ryazanov <ryazanov.s.a@gmail.com> wrote: > On Fri, Aug 6, 2021 at 12:00 PM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > ida_alloc_range)) may return other than -ENOMEM error code. > > Unshadow it in the wwan_create_port(). > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > A small nitpick, looks like "ida_alloc_range))" in the description is > a typo and should be "ida_alloc_range()". Besides this: Shall I resend? > Reviewed-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> Thanks!
On Fri, Aug 06, 2021 at 11:35:04PM +0300, Sergey Ryazanov wrote: > On Fri, Aug 6, 2021 at 5:20 PM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > On Fri, Aug 6, 2021 at 5:14 PM Sergey Ryazanov <ryazanov.s.a@gmail.com> wrote: > >> On Fri, Aug 6, 2021 at 12:00 PM Andy Shevchenko > >> <andriy.shevchenko@linux.intel.com> wrote: > >>> ida_alloc_range)) may return other than -ENOMEM error code. > >>> Unshadow it in the wwan_create_port(). > >>> > >>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > >> > >> A small nitpick, looks like "ida_alloc_range))" in the description is > >> a typo and should be "ida_alloc_range()". Besides this: > > > > Shall I resend? > > Yes, please. And specify the target tree in the subject, please. See > patchwork warning [1, 2]. The first patch is a clear bug fix, so it > should be targeted to the 'net' tree, while the second patch despite > its usefulness could not be considered a bug fix, so it should be > targeted to the 'net-next' tree. Subjects could be like this: > > [PATCHv3 net 1/2] wwan: core: Avoid returning NULL from wwan_create_dev() > [PATCHv3 net-next 2/2] wwan: core: Unshadow error code returned by > ida_alloc_range() > > Or since the second patch is not depends on the first one and patches > target different trees, patches could be submitted independently: > > [PATCHv3 net] wwan: core: Avoid returning NULL from wwan_create_dev() > [PATCHv3 net-next] wwan: core: Unshadow error code returned by ida_alloc_range() Split and sent separately, thanks! > 1. https://patchwork.kernel.org/project/netdevbpf/patch/20210806085413.61536-1-andriy.shevchenko@linux.intel.com/ > 2. https://patchwork.kernel.org/project/netdevbpf/patch/20210806085413.61536-2-andriy.shevchenko@linux.intel.com/ -- With Best Regards, Andy Shevchenko
diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index 35ece98134c0..d293ab688044 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -359,8 +359,8 @@ struct wwan_port *wwan_create_port(struct device *parent, { struct wwan_device *wwandev; struct wwan_port *port; - int minor, err = -ENOMEM; char namefmt[0x20]; + int minor, err; if (type > WWAN_PORT_MAX || !ops) return ERR_PTR(-EINVAL); @@ -374,11 +374,14 @@ struct wwan_port *wwan_create_port(struct device *parent, /* A port is exposed as character device, get a minor */ minor = ida_alloc_range(&minors, 0, WWAN_MAX_MINORS - 1, GFP_KERNEL); - if (minor < 0) + if (minor < 0) { + err = minor; goto error_wwandev_remove; + } port = kzalloc(sizeof(*port), GFP_KERNEL); if (!port) { + err = -ENOMEM; ida_free(&minors, minor); goto error_wwandev_remove; }
ida_alloc_range)) may return other than -ENOMEM error code. Unshadow it in the wwan_create_port(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: new patch drivers/net/wwan/wwan_core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)