* [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse
@ 2020-05-25 9:55 ` Horatiu Vultur
0 siblings, 0 replies; 6+ messages in thread
From: Horatiu Vultur @ 2020-05-25 9:55 UTC (permalink / raw)
To: nikolay, roopa, davem, kuba, andrew, UNGLinuxDriver, bridge,
netdev, linux-kernel
Cc: Horatiu Vultur, syzbot+9c6f0f1f8e32223df9a4
The issue was reported by syzbot. When the function br_mrp_parse was
called with a valid net_bridge_port, the net_bridge was an invalid
pointer. Therefore the check br->stp_enabled could pass/fail
depending where it was pointing in memory.
The fix consists of setting the net_bridge pointer if the port is a
valid pointer.
Reported-by: syzbot+9c6f0f1f8e32223df9a4@syzkaller.appspotmail.com
Fixes: 6536993371fa ("bridge: mrp: Integrate MRP into the bridge")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
net/bridge/br_mrp_netlink.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c
index 397e7f710772a..4a08a99519b04 100644
--- a/net/bridge/br_mrp_netlink.c
+++ b/net/bridge/br_mrp_netlink.c
@@ -27,6 +27,12 @@ int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,
struct nlattr *tb[IFLA_BRIDGE_MRP_MAX + 1];
int err;
+ /* When this function is called for a port then the br pointer is
+ * invalid, therefor set the br to point correctly
+ */
+ if (p)
+ br = p->br;
+
if (br->stp_enabled != BR_NO_STP) {
NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled");
return -EINVAL;
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Bridge] [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse
@ 2020-05-25 9:55 ` Horatiu Vultur
0 siblings, 0 replies; 6+ messages in thread
From: Horatiu Vultur @ 2020-05-25 9:55 UTC (permalink / raw)
To: nikolay, roopa, davem, kuba, andrew, UNGLinuxDriver, bridge,
netdev, linux-kernel
Cc: syzbot+9c6f0f1f8e32223df9a4, Horatiu Vultur
The issue was reported by syzbot. When the function br_mrp_parse was
called with a valid net_bridge_port, the net_bridge was an invalid
pointer. Therefore the check br->stp_enabled could pass/fail
depending where it was pointing in memory.
The fix consists of setting the net_bridge pointer if the port is a
valid pointer.
Reported-by: syzbot+9c6f0f1f8e32223df9a4@syzkaller.appspotmail.com
Fixes: 6536993371fa ("bridge: mrp: Integrate MRP into the bridge")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
net/bridge/br_mrp_netlink.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c
index 397e7f710772a..4a08a99519b04 100644
--- a/net/bridge/br_mrp_netlink.c
+++ b/net/bridge/br_mrp_netlink.c
@@ -27,6 +27,12 @@ int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,
struct nlattr *tb[IFLA_BRIDGE_MRP_MAX + 1];
int err;
+ /* When this function is called for a port then the br pointer is
+ * invalid, therefor set the br to point correctly
+ */
+ if (p)
+ br = p->br;
+
if (br->stp_enabled != BR_NO_STP) {
NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled");
return -EINVAL;
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse
2020-05-25 9:55 ` [Bridge] " Horatiu Vultur
@ 2020-05-25 8:34 ` Nikolay Aleksandrov
-1 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2020-05-25 8:34 UTC (permalink / raw)
To: Horatiu Vultur, roopa, davem, kuba, andrew, UNGLinuxDriver,
bridge, netdev, linux-kernel
Cc: syzbot+9c6f0f1f8e32223df9a4
On 25/05/2020 12:55, Horatiu Vultur wrote:
> The issue was reported by syzbot. When the function br_mrp_parse was
> called with a valid net_bridge_port, the net_bridge was an invalid
> pointer. Therefore the check br->stp_enabled could pass/fail
> depending where it was pointing in memory.
> The fix consists of setting the net_bridge pointer if the port is a
> valid pointer.
>
> Reported-by: syzbot+9c6f0f1f8e32223df9a4@syzkaller.appspotmail.com
> Fixes: 6536993371fa ("bridge: mrp: Integrate MRP into the bridge")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---
> net/bridge/br_mrp_netlink.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c
> index 397e7f710772a..4a08a99519b04 100644
> --- a/net/bridge/br_mrp_netlink.c
> +++ b/net/bridge/br_mrp_netlink.c
> @@ -27,6 +27,12 @@ int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,
> struct nlattr *tb[IFLA_BRIDGE_MRP_MAX + 1];
> int err;
>
> + /* When this function is called for a port then the br pointer is
> + * invalid, therefor set the br to point correctly
> + */
> + if (p)
> + br = p->br;
> +
> if (br->stp_enabled != BR_NO_STP) {
> NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled");
> return -EINVAL;
>
You should tag the fix for net-next when it's intended for it.
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Bridge] [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse
@ 2020-05-25 8:34 ` Nikolay Aleksandrov
0 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2020-05-25 8:34 UTC (permalink / raw)
To: Horatiu Vultur, roopa, davem, kuba, andrew, UNGLinuxDriver,
bridge, netdev, linux-kernel
Cc: syzbot+9c6f0f1f8e32223df9a4
On 25/05/2020 12:55, Horatiu Vultur wrote:
> The issue was reported by syzbot. When the function br_mrp_parse was
> called with a valid net_bridge_port, the net_bridge was an invalid
> pointer. Therefore the check br->stp_enabled could pass/fail
> depending where it was pointing in memory.
> The fix consists of setting the net_bridge pointer if the port is a
> valid pointer.
>
> Reported-by: syzbot+9c6f0f1f8e32223df9a4@syzkaller.appspotmail.com
> Fixes: 6536993371fa ("bridge: mrp: Integrate MRP into the bridge")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---
> net/bridge/br_mrp_netlink.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c
> index 397e7f710772a..4a08a99519b04 100644
> --- a/net/bridge/br_mrp_netlink.c
> +++ b/net/bridge/br_mrp_netlink.c
> @@ -27,6 +27,12 @@ int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,
> struct nlattr *tb[IFLA_BRIDGE_MRP_MAX + 1];
> int err;
>
> + /* When this function is called for a port then the br pointer is
> + * invalid, therefor set the br to point correctly
> + */
> + if (p)
> + br = p->br;
> +
> if (br->stp_enabled != BR_NO_STP) {
> NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled");
> return -EINVAL;
>
You should tag the fix for net-next when it's intended for it.
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse
2020-05-25 9:55 ` [Bridge] " Horatiu Vultur
@ 2020-05-26 1:10 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-05-26 1:10 UTC (permalink / raw)
To: horatiu.vultur
Cc: nikolay, roopa, kuba, andrew, UNGLinuxDriver, bridge, netdev,
linux-kernel, syzbot+9c6f0f1f8e32223df9a4
From: Horatiu Vultur <horatiu.vultur@microchip.com>
Date: Mon, 25 May 2020 09:55:41 +0000
> The issue was reported by syzbot. When the function br_mrp_parse was
> called with a valid net_bridge_port, the net_bridge was an invalid
> pointer. Therefore the check br->stp_enabled could pass/fail
> depending where it was pointing in memory.
> The fix consists of setting the net_bridge pointer if the port is a
> valid pointer.
>
> Reported-by: syzbot+9c6f0f1f8e32223df9a4@syzkaller.appspotmail.com
> Fixes: 6536993371fa ("bridge: mrp: Integrate MRP into the bridge")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Bridge] [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse
@ 2020-05-26 1:10 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-05-26 1:10 UTC (permalink / raw)
To: horatiu.vultur
Cc: andrew, nikolay, netdev, roopa, bridge, linux-kernel,
UNGLinuxDriver, syzbot+9c6f0f1f8e32223df9a4, kuba
From: Horatiu Vultur <horatiu.vultur@microchip.com>
Date: Mon, 25 May 2020 09:55:41 +0000
> The issue was reported by syzbot. When the function br_mrp_parse was
> called with a valid net_bridge_port, the net_bridge was an invalid
> pointer. Therefore the check br->stp_enabled could pass/fail
> depending where it was pointing in memory.
> The fix consists of setting the net_bridge pointer if the port is a
> valid pointer.
>
> Reported-by: syzbot+9c6f0f1f8e32223df9a4@syzkaller.appspotmail.com
> Fixes: 6536993371fa ("bridge: mrp: Integrate MRP into the bridge")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-26 1:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-25 9:55 [PATCH] bridge: mrp: Fix out-of-bounds read in br_mrp_parse Horatiu Vultur
2020-05-25 9:55 ` [Bridge] " Horatiu Vultur
2020-05-25 8:34 ` Nikolay Aleksandrov
2020-05-25 8:34 ` [Bridge] " Nikolay Aleksandrov
2020-05-26 1:10 ` David Miller
2020-05-26 1:10 ` [Bridge] " 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.