| Message ID | 20190624144757.1285-1-colin.king@canonical.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [next] 6lowpan: fix off-by-one comparison of index id with LOWPAN_IPHC_CTX_TABLE_SIZE | expand |
Hi Colin, > The WARN_ON_ONCE check on id is off-by-one, it should be greater or equal > to LOWPAN_IPHC_CTX_TABLE_SIZE and not greater than. Fix this. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > net/6lowpan/debugfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c > index 1c140af06d52..a510bed8165b 100644 > --- a/net/6lowpan/debugfs.c > +++ b/net/6lowpan/debugfs.c > @@ -170,7 +170,7 @@ static void lowpan_dev_debugfs_ctx_init(struct net_device *dev, > struct dentry *root; > char buf[32]; > > - WARN_ON_ONCE(id > LOWPAN_IPHC_CTX_TABLE_SIZE); > + WARN_ON_ONCE(id >= LOWPAN_IPHC_CTX_TABLE_SIZE); this patch no longer applied cleanly to bluetooth-next. Can you send me an updated version. Regards Marcel
On 06/07/2019 11:51, Marcel Holtmann wrote: > Hi Colin, > >> The WARN_ON_ONCE check on id is off-by-one, it should be greater or equal >> to LOWPAN_IPHC_CTX_TABLE_SIZE and not greater than. Fix this. >> >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> net/6lowpan/debugfs.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c >> index 1c140af06d52..a510bed8165b 100644 >> --- a/net/6lowpan/debugfs.c >> +++ b/net/6lowpan/debugfs.c >> @@ -170,7 +170,7 @@ static void lowpan_dev_debugfs_ctx_init(struct net_device *dev, >> struct dentry *root; >> char buf[32]; >> >> - WARN_ON_ONCE(id > LOWPAN_IPHC_CTX_TABLE_SIZE); >> + WARN_ON_ONCE(id >= LOWPAN_IPHC_CTX_TABLE_SIZE); > > this patch no longer applied cleanly to bluetooth-next. Can you send me an updated version. I'm confused by this, I just applied it OK on bluetooth-next [1] on the head 9ce67c3235be71e8cf922a9b3d0b7359ed3f4ce5, am I applying this to the wrong repo/branch? [1] git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git Colin > > Regards > > Marcel >
diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c index 1c140af06d52..a510bed8165b 100644 --- a/net/6lowpan/debugfs.c +++ b/net/6lowpan/debugfs.c @@ -170,7 +170,7 @@ static void lowpan_dev_debugfs_ctx_init(struct net_device *dev, struct dentry *root; char buf[32]; - WARN_ON_ONCE(id > LOWPAN_IPHC_CTX_TABLE_SIZE); + WARN_ON_ONCE(id >= LOWPAN_IPHC_CTX_TABLE_SIZE); sprintf(buf, "%d", id);