* [net 1/3] caif: Clear shutdown mask to zero at reconnect.
@ 2012-06-24 21:01 sjur.brandeland
2012-06-24 21:01 ` [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost sjur.brandeland
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: sjur.brandeland @ 2012-06-24 21:01 UTC (permalink / raw)
To: davem; +Cc: netdev, sjurbren, Sjur Brændeland
From: Sjur Brændeland <sjur.brandeland@stericsson.com>
Clear caif sockets's shutdown mask at (re)connect.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
net/caif/caif_socket.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index fb89443..78f1cda 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -220,6 +220,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
cfsk_hold, cfsk_put);
cf_sk->sk.sk_state = CAIF_CONNECTED;
set_tx_flow_on(cf_sk);
+ cf_sk->sk.sk_shutdown = 0;
cf_sk->sk.sk_state_change(&cf_sk->sk);
break;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost
2012-06-24 21:01 [net 1/3] caif: Clear shutdown mask to zero at reconnect sjur.brandeland
@ 2012-06-24 21:01 ` sjur.brandeland
2012-06-25 23:07 ` David Miller
2012-06-24 21:01 ` [net 3/3] caif-hsi: Add missing return in error path sjur.brandeland
2012-06-25 23:07 ` [net 1/3] caif: Clear shutdown mask to zero at reconnect David Miller
2 siblings, 1 reply; 6+ messages in thread
From: sjur.brandeland @ 2012-06-24 21:01 UTC (permalink / raw)
To: davem; +Cc: netdev, sjurbren, Per Ellefsen, Per Ellefsen,
Sjur Brændeland
From: Per Ellefsen <Per.Ellefsen@stericsson.com>
When receiving a piggyback'ed descriptor containing an
embedded frame, but no payload, the embedded frame was
lost.
Signed-off-by: Per Ellefsen <per.ellefsen@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
drivers/net/caif/caif_hsi.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 1520814..1f52ff3 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -693,8 +693,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
*/
memcpy(rx_buf, (u8 *)piggy_desc,
CFHSI_DESC_SHORT_SZ);
- /* Mark no embedded frame here */
- piggy_desc->offset = 0;
if (desc_pld_len == -EPROTO)
goto out_of_sync;
}
@@ -737,6 +735,8 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
/* Extract any payload in piggyback descriptor. */
if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0)
goto out_of_sync;
+ /* Mark no embedded frame after extracting it */
+ piggy_desc->offset = 0;
}
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net 3/3] caif-hsi: Add missing return in error path
2012-06-24 21:01 [net 1/3] caif: Clear shutdown mask to zero at reconnect sjur.brandeland
2012-06-24 21:01 ` [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost sjur.brandeland
@ 2012-06-24 21:01 ` sjur.brandeland
2012-06-25 23:07 ` David Miller
2012-06-25 23:07 ` [net 1/3] caif: Clear shutdown mask to zero at reconnect David Miller
2 siblings, 1 reply; 6+ messages in thread
From: sjur.brandeland @ 2012-06-24 21:01 UTC (permalink / raw)
To: davem; +Cc: netdev, sjurbren, Sjur Brændeland
From: Sjur Brændeland <sjur.brandeland@stericsson.com>
Fix a missing return, causing access to freed memory.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
drivers/net/caif/caif_hsi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 1f52ff3..4a27adb 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -1178,6 +1178,7 @@ int cfhsi_probe(struct platform_device *pdev)
dev_err(&ndev->dev, "%s: Registration error: %d.\n",
__func__, res);
free_netdev(ndev);
+ return -ENODEV;
}
/* Add CAIF HSI device to list. */
spin_lock(&cfhsi_list_lock);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [net 1/3] caif: Clear shutdown mask to zero at reconnect.
2012-06-24 21:01 [net 1/3] caif: Clear shutdown mask to zero at reconnect sjur.brandeland
2012-06-24 21:01 ` [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost sjur.brandeland
2012-06-24 21:01 ` [net 3/3] caif-hsi: Add missing return in error path sjur.brandeland
@ 2012-06-25 23:07 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2012-06-25 23:07 UTC (permalink / raw)
To: sjur.brandeland; +Cc: netdev, sjurbren
From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:36 +0200
> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
>
> Clear caif sockets's shutdown mask at (re)connect.
>
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-25 23:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-24 21:01 [net 1/3] caif: Clear shutdown mask to zero at reconnect sjur.brandeland
2012-06-24 21:01 ` [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost sjur.brandeland
2012-06-25 23:07 ` David Miller
2012-06-24 21:01 ` [net 3/3] caif-hsi: Add missing return in error path sjur.brandeland
2012-06-25 23:07 ` David Miller
2012-06-25 23:07 ` [net 1/3] caif: Clear shutdown mask to zero at reconnect David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).