| Message ID | 20200818090153.9286-1-hacks@slashdirt.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | generic: platform/mikrotik: fix incorrect test | expand |
Hi, This patch also targets 19.07: please cherry pick when merged. Thibaut
> -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Thibaut VARÈNE > Sent: Dienstag, 18. August 2020 11:02 > To: openwrt-devel@lists.openwrt.org > Cc: Thibaut VARÈNE <hacks@slashdirt.org> > Subject: [PATCH] generic: platform/mikrotik: fix incorrect test > > Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> > --- > .../generic/files/drivers/platform/mikrotik/rb_hardconfig.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > index 4559418de7..8861814be4 100644 > --- a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > +++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > @@ -480,7 +480,7 @@ static int hc_wlan_data_unpack_lzor(const u8 *inbuf, > size_t inlen, > /* Temporary buffer same size as the outbuf */ > templen = *outlen; > tempbuf = kmalloc(templen, GFP_KERNEL); > - if (!outbuf) > + if (!tempbuf) No version bump? > return -ENOMEM; > > /* Concatenate into the outbuf */ > -- > 2.24.3 (Apple Git-128) > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
> -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Thibaut VARÈNE > Sent: Dienstag, 18. August 2020 11:02 > To: openwrt-devel@lists.openwrt.org > Cc: Thibaut VARÈNE <hacks@slashdirt.org> > Subject: [PATCH] generic: platform/mikrotik: fix incorrect test And to be merged, this needs a commit message. Best Adrian > > Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> > --- > .../generic/files/drivers/platform/mikrotik/rb_hardconfig.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > index 4559418de7..8861814be4 100644 > --- a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > +++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c > @@ -480,7 +480,7 @@ static int hc_wlan_data_unpack_lzor(const u8 *inbuf, > size_t inlen, > /* Temporary buffer same size as the outbuf */ > templen = *outlen; > tempbuf = kmalloc(templen, GFP_KERNEL); > - if (!outbuf) > + if (!tempbuf) > return -ENOMEM; > > /* Concatenate into the outbuf */ > -- > 2.24.3 (Apple Git-128) > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
> Le 18 août 2020 à 11:26, Adrian Schmutzler <mail@adrianschmutzler.de> a écrit : > >> -----Original Message----- >> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] >> On Behalf Of Thibaut VARÈNE >> Sent: Dienstag, 18. August 2020 11:02 >> To: openwrt-devel@lists.openwrt.org >> Cc: Thibaut VARÈNE <hacks@slashdirt.org> >> Subject: [PATCH] generic: platform/mikrotik: fix incorrect test > > And to be merged, this needs a commit message. The commit message is the commit title. I didn’t expect this to be a problem, as evidenced by 6bdd4c967b or 072c5876c and many other similar commits? I didn’t think this one-liner warranted a version bump either, since the operation of the driver is unchanged under normal circumstances. Best, Thibaut
diff --git a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c index 4559418de7..8861814be4 100644 --- a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c +++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c @@ -480,7 +480,7 @@ static int hc_wlan_data_unpack_lzor(const u8 *inbuf, size_t inlen, /* Temporary buffer same size as the outbuf */ templen = *outlen; tempbuf = kmalloc(templen, GFP_KERNEL); - if (!outbuf) + if (!tempbuf) return -ENOMEM; /* Concatenate into the outbuf */
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> --- .../generic/files/drivers/platform/mikrotik/rb_hardconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)