* [patch -next] tipc: potential shift wrapping bug in map_set()
@ 2016-06-17 9:22 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2016-06-17 9:22 UTC (permalink / raw)
To: Jon Maloy
Cc: Ying Xue, David S. Miller, netdev, tipc-discussion, kernel-janitors
"up_map" is a u64 type but we're not using the high 32 bits.
Fixes: 35c55c9877f8 ('tipc: add neighbor monitoring framework')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index 87d4efe..0d489e8 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -122,8 +122,8 @@ static int dom_size(int peers)
static void map_set(u64 *up_map, int i, unsigned int v)
{
- *up_map &= ~(1 << i);
- *up_map |= (v << i);
+ *up_map &= ~(1ULL << i);
+ *up_map |= ((u64)v << i);
}
static int map_get(u64 up_map, int i)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch -next] tipc: potential shift wrapping bug in map_set()
@ 2016-06-17 9:22 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2016-06-17 9:22 UTC (permalink / raw)
To: Jon Maloy
Cc: Ying Xue, David S. Miller, netdev, tipc-discussion, kernel-janitors
"up_map" is a u64 type but we're not using the high 32 bits.
Fixes: 35c55c9877f8 ('tipc: add neighbor monitoring framework')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index 87d4efe..0d489e8 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -122,8 +122,8 @@ static int dom_size(int peers)
static void map_set(u64 *up_map, int i, unsigned int v)
{
- *up_map &= ~(1 << i);
- *up_map |= (v << i);
+ *up_map &= ~(1ULL << i);
+ *up_map |= ((u64)v << i);
}
static int map_get(u64 up_map, int i)
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch -next] tipc: potential shift wrapping bug in map_set()
2016-06-17 9:22 ` Dan Carpenter
@ 2016-06-17 12:01 ` Jon Maloy
-1 siblings, 0 replies; 6+ messages in thread
From: Jon Maloy @ 2016-06-17 12:01 UTC (permalink / raw)
To: Dan Carpenter; +Cc: netdev, kernel-janitors, tipc-discussion, David S. Miller
Acked. This will only be relevant in clusters > 1000 nodes, which I must admit I haven't tested yet.
///jon
> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Friday, 17 June, 2016 05:22
> To: Jon Maloy
> Cc: Ying Xue; David S. Miller; netdev@vger.kernel.org; tipc-
> discussion@lists.sourceforge.net; kernel-janitors@vger.kernel.org
> Subject: [patch -next] tipc: potential shift wrapping bug in map_set()
>
> "up_map" is a u64 type but we're not using the high 32 bits.
>
> Fixes: 35c55c9877f8 ('tipc: add neighbor monitoring framework')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
> index 87d4efe..0d489e8 100644
> --- a/net/tipc/monitor.c
> +++ b/net/tipc/monitor.c
> @@ -122,8 +122,8 @@ static int dom_size(int peers)
>
> static void map_set(u64 *up_map, int i, unsigned int v)
> {
> - *up_map &= ~(1 << i);
> - *up_map |= (v << i);
> + *up_map &= ~(1ULL << i);
> + *up_map |= ((u64)v << i);
> }
>
> static int map_get(u64 up_map, int i)
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports. http://sdm.link/zohomanageengine
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [patch -next] tipc: potential shift wrapping bug in map_set()
@ 2016-06-17 12:01 ` Jon Maloy
0 siblings, 0 replies; 6+ messages in thread
From: Jon Maloy @ 2016-06-17 12:01 UTC (permalink / raw)
To: Dan Carpenter; +Cc: netdev, kernel-janitors, tipc-discussion, David S. Miller
Acked. This will only be relevant in clusters > 1000 nodes, which I must admit I haven't tested yet.
///jon
> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Friday, 17 June, 2016 05:22
> To: Jon Maloy
> Cc: Ying Xue; David S. Miller; netdev@vger.kernel.org; tipc-
> discussion@lists.sourceforge.net; kernel-janitors@vger.kernel.org
> Subject: [patch -next] tipc: potential shift wrapping bug in map_set()
>
> "up_map" is a u64 type but we're not using the high 32 bits.
>
> Fixes: 35c55c9877f8 ('tipc: add neighbor monitoring framework')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
> index 87d4efe..0d489e8 100644
> --- a/net/tipc/monitor.c
> +++ b/net/tipc/monitor.c
> @@ -122,8 +122,8 @@ static int dom_size(int peers)
>
> static void map_set(u64 *up_map, int i, unsigned int v)
> {
> - *up_map &= ~(1 << i);
> - *up_map |= (v << i);
> + *up_map &= ~(1ULL << i);
> + *up_map |= ((u64)v << i);
> }
>
> static int map_get(u64 up_map, int i)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch -next] tipc: potential shift wrapping bug in map_set()
2016-06-17 9:22 ` Dan Carpenter
@ 2016-06-18 4:27 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-06-18 4:27 UTC (permalink / raw)
To: dan.carpenter
Cc: jon.maloy, ying.xue, netdev, tipc-discussion, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 17 Jun 2016 12:22:26 +0300
> "up_map" is a u64 type but we're not using the high 32 bits.
>
> Fixes: 35c55c9877f8 ('tipc: add neighbor monitoring framework')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch -next] tipc: potential shift wrapping bug in map_set()
@ 2016-06-18 4:27 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-06-18 4:27 UTC (permalink / raw)
To: dan.carpenter
Cc: jon.maloy, ying.xue, netdev, tipc-discussion, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 17 Jun 2016 12:22:26 +0300
> "up_map" is a u64 type but we're not using the high 32 bits.
>
> Fixes: 35c55c9877f8 ('tipc: add neighbor monitoring framework')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-18 4:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-17 9:22 [patch -next] tipc: potential shift wrapping bug in map_set() Dan Carpenter
2016-06-17 9:22 ` Dan Carpenter
2016-06-17 12:01 ` Jon Maloy
2016-06-17 12:01 ` Jon Maloy
2016-06-18 4:27 ` David Miller
2016-06-18 4:27 ` David Miller
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.