[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090328032332.GA22353@bombadil.infradead.org>
Date: Fri, 27 Mar 2009 23:23:32 -0400
From: Kyle McMartin <kyle@...artin.ca>
To: netdev@...r.kernel.org
Cc: Dan Carpenter <error27@...il.com>, grundler@...isc-linux.org
Subject: Re: Null dereference in uli526x_rx_packet()
On Fri, Mar 27, 2009 at 10:47:54PM -0400, Kyle McMartin wrote:
> > I don't know if the right fix is to return like this patch does or to set
> > skb = rxptr->rx_skb_ptr again.
> >
>
> Ick... that's a good catch. I'll have to think about this.
>
I think this is alright, it at least keeps the original intent of the
code. I don't pretend to have figured it out yet though.
I'll stare more at this Monday...
I guess the real question is does anyone still have one of these
cards. I don't think I do, just the proper tulips. :/
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 030e02e..9264a58 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -840,13 +840,15 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
if ( !(rdes0 & 0x8000) ||
((db->cr6_data & CR6_PM) && (rxlen>6)) ) {
+ struct sk_buff *new_skb = NULL;
+
skb = rxptr->rx_skb_ptr;
/* Good packet, send to upper layer */
/* Shorst packet used new SKB */
- if ( (rxlen < RX_COPY_SIZE) &&
- ( (skb = dev_alloc_skb(rxlen + 2) )
- != NULL) ) {
+ if ((rxlen < RX_COPY_SIZE) &&
+ ((new_skb = dev_alloc_skb(rxlen + 2) != NULL))) {
+ skb = new_skb;
/* size less than COPY_SIZE, allocate a rxlen SKB */
skb_reserve(skb, 2); /* 16byte align */
memcpy(skb_put(skb, rxlen),
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists