tools/libbpf: signedness bug in btf_dedup_ref_type()
Subsystems (7)
PATCH 1/1 tools/libbpf: signedness bug in btf_dedup_ref_type()
The "ref_type_id" variable needs to be signed for the error handling to work.
---
This goes through the BPF tree probably, although it does apply to net-next.
tools/lib/bpf/btf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/lib/bpf/btf.c +2 -1
@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; +__u32 h; +int ref_type_id;if (d->map[type_id] =BTF_IN_PROGRESS_ID )return -ELOOP ;
Signature · 1 line
2.17.1
DQoNCk9uIDIvMjcvMTkgOTo0NiBQTSwgRGFuIENhcnBlbnRlciB3cm90ZToNCj4gVGhlICJyZWZf dHlwZV9pZCIgdmFyaWFibGUgbmVlZHMgdG8gYmUgc2lnbmVkIGZvciB0aGUgZXJyb3IgaGFuZGxp bmcNCj4gdG8gd29yay4NCj4gDQo+IEZpeGVzOiBkNWNhZWY1YjU2NTUgKCJidGY6IGFkZCBCVEYg dHlwZXMgZGVkdXBsaWNhdGlvbiBhbGdvcml0aG0iKQ0KPiBTaWduZWQtb2ZmLWJ5OiBEYW4gQ2Fy cGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+DQo+IC0tLQ0KPiBUaGlzIGdvZXMgdGhy b3VnaCB0aGUgQlBGIHRyZWUgcHJvYmFibHksIGFsdGhvdWdoIGl0IGRvZXMgYXBwbHkgdG8NCj4g bmV0LW5leHQuDQo+IA0KPiAgIHRvb2xzL2xpYi9icGYvYnRmLmMgfCAzICsrLQ0KPiAgIDEgZmls ZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCj4gDQo+IGRpZmYgLS1n aXQgYS90b29scy9saWIvYnBmL2J0Zi5jIGIvdG9vbHMvbGliL2JwZi9idGYuYw0KPiBpbmRleCA2 OGI1MGU5YmJkZTEuLjhmYWVkNTM4NjEyNCAxMDA2NDQNCj4gLS0tIGEvdG9vbHMvbGliL2JwZi9i dGYuYw0KPiArKysgYi90b29scy9saWIvYnBmL2J0Zi5jDQo+IEBAIC0yMzI2LDcgKzIzMjYsOCBA QCBzdGF0aWMgaW50IGJ0Zl9kZWR1cF9yZWZfdHlwZShzdHJ1Y3QgYnRmX2RlZHVwICpkLCBfX3Uz MiB0eXBlX2lkKQ0KPiAgIAlzdHJ1Y3QgYnRmX3R5cGUgKnQsICpjYW5kOw0KPiAgIAkvKiBpZiB3 ZSBkb24ndCBmaW5kIGVxdWl2YWxlbnQgdHlwZSwgdGhlbiB3ZSBhcmUgcmVwcmVzZW50YXRpdmUg dHlwZSAqLw0KPiAgIAlfX3UzMiBuZXdfaWQgPSB0eXBlX2lkOw0KPiAtCV9fdTMyIGgsIHJlZl90 eXBlX2lkOw0KPiArCV9fdTMyIGg7ID4gKwlpbnQgcmVmX3R5cGVfaWQ7DQoNCm5pdC4gTWF5YmUg eW91IGNhbiBjaGFuZ2UgdG8NCglpbnQgcmVmX3R5cGVfaWQ7DQoJX191MzIgaDsNCnRvIG1haW50 YWluIGtlcm5lbCBkZWNsYXJhdGlvbiByZXZlcnNlIGNocmlzdG1hcyB0cmVlIGNvbnZlbnRpb24/ DQoNCj4gICANCj4gICAJaWYgKGQtPm1hcFt0eXBlX2lkXSA9PSBCVEZfSU5fUFJPR1JFU1NfSUQp DQo+ICAgCQlyZXR1cm4gLUVMT09QOw0KPiANCg=
Quoted 27 lines · Yonghong Song
Quoted 17 lines · Dan Carpenter
The "
ref_type_id" variable needs to be signed for the error handling to work.Fixes d5caef5b5655 ("btf: add BTF types deduplication algorithm")Signed-off-by Dan Carpenter <[email protected]>---
This goes through the BPF tree probably, although it does apply to net-next.tools/lib/bpf/btf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tools/lib/bpf/btf.c +0
-0tools/lib/bpf/btf.c static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id) · line 2329
Quoted 5 lines
tools/lib/bpf/btf.c +1
-1@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; + __u32 h; > + int ref_type_id;nit. Maybe you can change to
Quoted 4 lines
int ref_type_id; __u32 h;to maintain kernel declaration reverse christmas tree convention?
Yes. Thanks. Let me resend.
regards,
dan carpenter
Andrii Nakryiko
Acked-byQuoted 34 lines · Dan Carpenter
Quoted 27 lines · Yonghong Song
Quoted 17 lines · Dan Carpenter
The "
ref_type_id" variable needs to be signed for the error handling to work.Fixes d5caef5b5655 ("btf: add BTF types deduplication algorithm")Signed-off-by Dan Carpenter <[email protected]>---
This goes through the BPF tree probably, although it does apply to net-next.tools/lib/bpf/btf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tools/lib/bpf/btf.c +0
-0tools/lib/bpf/btf.c static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id) · line 2329
Quoted 5 lines
tools/lib/bpf/btf.c +1
-1@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; + __u32 h; > + int ref_type_id;nit. Maybe you can change to
Quoted 4 lines
int ref_type_id; __u32 h;to maintain kernel declaration reverse christmas tree convention?
Quoted 2 lines
Yes. Thanks. Let me resend.
Thanks for catching and fixing this! With Yonghong's suggestion, you can add:
Quoted 3 lines
regards,
dan carpenter
PATCH v2 1/1 tools/libbpf: signedness bug in btf_dedup_ref_type()
In reply to Yonghong SongThe "ref_type_id" variable needs to be signed for the error handling to work.
---
v2: Use reverse Christmas tree style
This goes through the BPF tree probably, although it does apply to net-next.
drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- tools/lib/bpf/btf.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.h +1 -1
@@ -197,7 +197,7 @@ struct iser_data_buf {struct scatterlist *sg;int size;unsigned long data_len; -unsigned int dma_nents; +int dma_nents; };/* fwd declarations */
tools/lib/bpf/btf.c +2 -1
@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; +int ref_type_id; +__u32 h;if (d->map[type_id] =BTF_IN_PROGRESS_ID )return -ELOOP ;
Signature · 1 line
2.17.1
Em Thu, Feb 28, 2019 at 08:50:35PM +0300, Dan Carpenter escreveu:
Quoted 2 lines
The "
ref_type_id" variable needs to be signed for the error handling to work.
Does the infiniband signedness change comes as a bonus? :-)
- Arnaldo
Quoted 42 lines
Fixes d5caef5b5655 ("btf: add BTF types deduplication algorithm")Signed-off-by Dan Carpenter <[email protected]>Acked-by Andrii Nakryiko <[email protected]>---
v2: Use reverse Christmas tree styleThis goes through the BPF tree probably, although it does apply to net-next.
drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- tools/lib/bpf/btf.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/infiniband/ulp/iser/iscsi_iser.h +1
-1@@ -197,7 +197,7 @@ struct iser_data_buf {struct scatterlist *sg;int size;unsigned long data_len; -unsigned int dma_nents; +int dma_nents; };/* fwd declarations */ tools/lib/bpf/btf.c +2
-1@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; +int ref_type_id; +__u32 h;if (d->map[type_id] =BTF_IN_PROGRESS_ID )return -ELOOP ;Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
Quoted 6 lines · Arnaldo Carvalho de Melo
Em Thu, Feb 28, 2019 at 08:50:35PM +0300, Dan Carpenter escreveu:
Quoted 2 lines
The "
ref_type_id" variable needs to be signed for the error handling to work.Does the infiniband signedness change comes as a bonus? :-)
Oh wow... :P
Let me resend v3.
regards,
dan carpenter
PATCH v3 1/1 tools/libbpf: signedness bug in btf_dedup_ref_type()
In reply to Yonghong SongThe "ref_type_id" variable needs to be signed for the error handling to work.
---
v2: Use reverse Christmas tree style
v3: Remove the bonus fix.
This goes through the BPF tree probably, although it does apply to net-next.
tools/lib/bpf/btf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
tools/lib/bpf/btf.c +2 -1
@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; +int ref_type_id; +__u32 h;if (d->map[type_id] =BTF_IN_PROGRESS_ID )return -ELOOP ;
Signature · 1 line
2.17.1
Quoted 10 lines · Dan Carpenter
The "
ref_type_id" variable needs to be signed for the error handling to work.Fixes d5caef5b5655 ("btf: add BTF types deduplication algorithm")Signed-off-by Dan Carpenter <[email protected]>Acked-by Andrii Nakryiko <[email protected]>
Quoted 26 lines
---
v2: Use reverse Christmas tree style
v3: Remove the bonus fix.This goes through the BPF tree probably, although it does apply to net-next.
tools/lib/bpf/btf.c| 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)tools/lib/bpf/btf.c +2
-1@@ -2326,7 +2326,8 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)struct btf_type *t, *cand;/* if we don't find equivalent type, then we are representative type */ __u32 new_id = type_id; -__u32 h, ref_type_id; +int ref_type_id; +__u32 h;if (d->map[type_id] ==BTF_IN_PROGRESS_ID )return -ELOOP ;Signature · 1 line
2.17.1
Quoted 6 lines · Dan Carpenter
The "
ref_type_id" variable needs to be signed for the error handling to work.Fixes d5caef5b5655 ("btf: add BTF types deduplication algorithm")Signed-off-by Dan Carpenter <[email protected]>Acked-by Andrii Nakryiko <[email protected]>
Applied, thanks!