Commit 1b86fda9 authored by Ed Cashin's avatar Ed Cashin Committed by Linus Torvalds

aoe: increase net_device reference count while using it

This change eliminates the danger that the user could rmmod the driver for
a network interface that is being used for AoE by the aoe driver.
Signed-off-by: default avatarEd Cashin <ecashin@coraid.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 64a80f5a
...@@ -494,12 +494,15 @@ static void ...@@ -494,12 +494,15 @@ static void
ejectif(struct aoetgt *t, struct aoeif *ifp) ejectif(struct aoetgt *t, struct aoeif *ifp)
{ {
struct aoeif *e; struct aoeif *e;
struct net_device *nd;
ulong n; ulong n;
nd = ifp->nd;
e = t->ifs + NAOEIFS - 1; e = t->ifs + NAOEIFS - 1;
n = (e - ifp) * sizeof *ifp; n = (e - ifp) * sizeof *ifp;
memmove(ifp, ifp+1, n); memmove(ifp, ifp+1, n);
e->nd = NULL; e->nd = NULL;
dev_put(nd);
} }
static int static int
...@@ -1317,6 +1320,7 @@ setifbcnt(struct aoetgt *t, struct net_device *nd, int bcnt) ...@@ -1317,6 +1320,7 @@ setifbcnt(struct aoetgt *t, struct net_device *nd, int bcnt)
pr_err("aoe: device setifbcnt failure; too many interfaces.\n"); pr_err("aoe: device setifbcnt failure; too many interfaces.\n");
return; return;
} }
dev_hold(nd);
p->nd = nd; p->nd = nd;
p->bcnt = bcnt; p->bcnt = bcnt;
} }
......
...@@ -295,6 +295,13 @@ freetgt(struct aoedev *d, struct aoetgt *t) ...@@ -295,6 +295,13 @@ freetgt(struct aoedev *d, struct aoetgt *t)
{ {
struct frame *f; struct frame *f;
struct list_head *pos, *nx, *head; struct list_head *pos, *nx, *head;
struct aoeif *ifp;
for (ifp = t->ifs; ifp < &t->ifs[NAOEIFS]; ++ifp) {
if (!ifp->nd)
break;
dev_put(ifp->nd);
}
head = &t->ffree; head = &t->ffree;
list_for_each_safe(pos, nx, head) { list_for_each_safe(pos, nx, head) {
......
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