Commit f1ee89d5 authored by Jiri Slaby's avatar Jiri Slaby Committed by David S. Miller

ATM: solos-pci, remove use after free

Stanse found we do in console_show:
  kfree_skb(skb);
  return skb->len;
which is not good. Fix that by remembering the len and use it in the
function instead.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03c698c9
...@@ -444,6 +444,7 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr, ...@@ -444,6 +444,7 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr,
struct atm_dev *atmdev = container_of(dev, struct atm_dev, class_dev); struct atm_dev *atmdev = container_of(dev, struct atm_dev, class_dev);
struct solos_card *card = atmdev->dev_data; struct solos_card *card = atmdev->dev_data;
struct sk_buff *skb; struct sk_buff *skb;
unsigned int len;
spin_lock(&card->cli_queue_lock); spin_lock(&card->cli_queue_lock);
skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]); skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);
...@@ -451,11 +452,12 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr, ...@@ -451,11 +452,12 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr,
if(skb == NULL) if(skb == NULL)
return sprintf(buf, "No data.\n"); return sprintf(buf, "No data.\n");
memcpy(buf, skb->data, skb->len); len = skb->len;
dev_dbg(&card->dev->dev, "len: %d\n", skb->len); memcpy(buf, skb->data, len);
dev_dbg(&card->dev->dev, "len: %d\n", len);
kfree_skb(skb); kfree_skb(skb);
return skb->len; return len;
} }
static int send_command(struct solos_card *card, int dev, const char *buf, size_t size) static int send_command(struct solos_card *card, int dev, const char *buf, size_t size)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment