From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Chuck Wolber <chuckw@quantumlinux.com>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk
Subject: [patch 01/11] prism54 : Fix frame length
Date: Fri, 23 Dec 2005 14:27:18 -0800 [thread overview]
Message-ID: <20051223222718.GB18252@kroah.com> (raw)
In-Reply-To: <20051223222652.GA18252@kroah.com>
[-- Attachment #1: prism54_frame_size.patch --]
[-- Type: text/plain, Size: 1581 bytes --]
From: Roger While <simrw@sim-basis.de>
prism54 is leaking information when passing transmits to the firmware.
There is no requirement to adjust the length to >= ETH_ZLEN.
Just pass the skb length (after possible adjustment).
Signed-off-by: Roger While <simrw@sim-basis.de>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/net/wireless/prism54/islpci_eth.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
--- linux-2.6.14.1.orig/drivers/net/wireless/prism54/islpci_eth.c
+++ linux-2.6.14.1/drivers/net/wireless/prism54/islpci_eth.c
@@ -97,12 +97,6 @@ islpci_eth_transmit(struct sk_buff *skb,
/* lock the driver code */
spin_lock_irqsave(&priv->slock, flags);
- /* determine the amount of fragments needed to store the frame */
-
- frame_size = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
- if (init_wds)
- frame_size += 6;
-
/* check whether the destination queue has enough fragments for the frame */
curr_frag = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_TX_DATA_LQ]);
if (unlikely(curr_frag - priv->free_data_tx >= ISL38XX_CB_TX_QSIZE)) {
@@ -213,6 +207,7 @@ islpci_eth_transmit(struct sk_buff *skb,
/* store the skb address for future freeing */
priv->data_low_tx[index] = skb;
/* set the proper fragment start address and size information */
+ frame_size = skb->len;
fragment->size = cpu_to_le16(frame_size);
fragment->flags = cpu_to_le16(0); /* set to 1 if more fragments */
fragment->address = cpu_to_le32(pci_map_address);
--
next prev parent reply other threads:[~2005-12-23 22:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20051109182205.294803000@press.kroah.org>
2005-11-09 18:36 ` [patch 00/11] - stable review Greg KH
2005-11-09 18:36 ` [patch 01/11] prism54 : Fix frame length Greg KH
2005-11-09 18:36 ` [patch 02/11] fix XFS_QUOTA for modular XFS Greg KH
2005-11-09 18:36 ` [patch 03/11] Oops on suspend after on-the-fly switch to anticipatory i/o scheduler - PowerBook5, 4 Greg KH
2005-11-09 18:36 ` [patch 04/11] USB: always export interface information for modalias Greg KH
2005-11-09 18:36 ` [patch 05/11] tcp: BIC max increment too large Greg KH
2005-11-09 18:36 ` [patch 06/11] airo.c/airo_cs.c: correct prototypes Greg KH
2005-11-09 18:37 ` [patch 07/11] NET: Fix zero-size datagram reception Greg KH
2005-11-09 18:37 ` [patch 08/11] - fix signal->live leak in copy_process() Greg KH
2005-11-09 18:37 ` [patch 09/11] fix de_thread() vs send_group_sigqueue() race Greg KH
2005-11-09 18:37 ` [patch 10/11] ipvs: fix connection leak if expire_nodest_conn=1 Greg KH
2005-11-09 18:37 ` [patch 11/11] fix alpha breakage Greg KH
2005-11-09 20:10 ` [stable] [patch 00/11] - stable review Greg KH
2005-11-09 21:01 ` Chris Wright
2005-11-09 21:06 ` Zwane Mwaikambo
2005-12-23 22:26 ` Greg KH
2005-12-23 22:27 ` Greg KH [this message]
2005-12-23 22:27 ` [patch 02/11] fix XFS_QUOTA for modular XFS Greg KH
2005-12-23 22:27 ` [patch 03/11] Oops on suspend after on-the-fly switch to anticipatory i/o scheduler - PowerBook5, 4 Greg KH
2005-12-23 22:27 ` [patch 04/11] USB: always export interface information for modalias Greg KH
2005-12-23 22:27 ` [patch 05/11] tcp: BIC max increment too large Greg KH
2005-12-23 22:27 ` [patch 06/11] airo.c/airo_cs.c: correct prototypes Greg KH
2005-12-23 22:27 ` [patch 07/11] NET: Fix zero-size datagram reception Greg KH
2005-12-23 22:27 ` [patch 08/11] - fix signal->live leak in copy_process() Greg KH
2005-12-23 22:27 ` [patch 09/11] fix de_thread() vs send_group_sigqueue() race Greg KH
2005-12-23 22:28 ` [patch 10/11] ipvs: fix connection leak if expire_nodest_conn=1 Greg KH
2005-12-23 22:28 ` [patch 11/11] fix alpha breakage Greg KH
2005-12-23 22:46 ` [stable] [patch 00/11] - stable review Greg KH
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=20051223222718.GB18252@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome