From: Dan Carpenter <dan.carpenter@oracle.com>
To: Alexei Starovoitov <ast@kernel.org>, Andrii Nakryiko <andriin@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH v2] tools/libbpf: signedness bug in btf_dedup_ref_type()
Date: Thu, 28 Feb 2019 20:50:35 +0300 [thread overview]
Message-ID: <20190228175035.GA30148@kadam> (raw)
In-Reply-To: <a34432d0-b838-c004-ef79-052cd50996c0@fb.com>
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 <dan.carpenter@oracle.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
---
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(-)
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 120b40829560..ee7d3f6a666e 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -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 */
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 68b50e9bbde1..00a2f06e38fd 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -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;
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Alexei Starovoitov <ast@kernel.org>, Andrii Nakryiko <andriin@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH v2] tools/libbpf: signedness bug in btf_dedup_ref_type()
Date: Thu, 28 Feb 2019 17:50:35 +0000 [thread overview]
Message-ID: <20190228175035.GA30148@kadam> (raw)
In-Reply-To: <a34432d0-b838-c004-ef79-052cd50996c0@fb.com>
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 <dan.carpenter@oracle.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
---
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(-)
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 120b40829560..ee7d3f6a666e 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -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 */
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 68b50e9bbde1..00a2f06e38fd 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -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;
--
2.17.1
next prev parent reply other threads:[~2019-02-28 17:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 5:46 [PATCH] tools/libbpf: signedness bug in btf_dedup_ref_type() Dan Carpenter
2019-02-28 5:46 ` Dan Carpenter
2019-02-28 6:58 ` Yonghong Song
2019-02-28 6:58 ` Yonghong Song
2019-02-28 13:36 ` Dan Carpenter
2019-02-28 13:36 ` Dan Carpenter
2019-02-28 17:44 ` Andrii Nakryiko
2019-02-28 17:44 ` Andrii Nakryiko
2019-02-28 17:50 ` Dan Carpenter [this message]
2019-02-28 17:50 ` [PATCH v2] " Dan Carpenter
2019-02-28 17:53 ` Arnaldo Carvalho de Melo
2019-02-28 17:53 ` Arnaldo Carvalho de Melo
2019-02-28 18:01 ` Dan Carpenter
2019-02-28 18:01 ` Dan Carpenter
2019-02-28 18:06 ` [PATCH v3] " Dan Carpenter
2019-02-28 18:06 ` Dan Carpenter
2019-02-28 19:29 ` Song Liu
2019-03-01 0:01 ` Daniel Borkmann
2019-03-01 0:01 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190228175035.GA30148@kadam \
--to=dan.carpenter@oracle.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.