| From 6dd91f6644a73284262e81690b9a25cd0a9b96c7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 14 Jul 2020 13:00:27 +0200 |
| Subject: hippi: Fix a size used in a 'pci_free_consistent()' in an error |
| handling path |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 3195c4706b00106aa82c73acd28340fa8fc2bfc1 ] |
| |
| The size used when calling 'pci_alloc_consistent()' and |
| 'pci_free_consistent()' should match. |
| |
| Fix it and have it consistent with the corresponding call in 'rr_close()'. |
| |
| Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/hippi/rrunner.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c |
| index 313e006f74feb..6f3519123eb66 100644 |
| --- a/drivers/net/hippi/rrunner.c |
| +++ b/drivers/net/hippi/rrunner.c |
| @@ -1250,7 +1250,7 @@ static int rr_open(struct net_device *dev) |
| rrpriv->info = NULL; |
| } |
| if (rrpriv->rx_ctrl) { |
| - pci_free_consistent(pdev, sizeof(struct ring_ctrl), |
| + pci_free_consistent(pdev, 256 * sizeof(struct ring_ctrl), |
| rrpriv->rx_ctrl, rrpriv->rx_ctrl_dma); |
| rrpriv->rx_ctrl = NULL; |
| } |
| -- |
| 2.25.1 |
| |
