--- net/econet/af_econet.c

+++ net/econet/af_econet.c

@@ -296,23 +296,14 @@ static int econet_sendmsg(struct kiocb *

mutex_lock(&econet_mutex);

- if (saddr == NULL) {

- struct econet_sock *eo = ec_sk(sk);

-

- addr.station = eo->station;

- addr.net = eo->net;

- port = eo->port;

- cb = eo->cb;

- } else {

- if (msg->msg_namelen < sizeof(struct sockaddr_ec)) {

- mutex_unlock(&econet_mutex);

- return -EINVAL;

- }

- addr.station = saddr->addr.station;

- addr.net = saddr->addr.net;

- port = saddr->port;

- cb = saddr->cb;

- }

+ if (saddr == NULL || msg->msg_namelen < sizeof(struct sockaddr_ec)) {

+ mutex_unlock(&econet_mutex);

+ return -EINVAL;

+ }

+ addr.station = saddr->addr.station;

+ addr.net = saddr->addr.net;

+ port = saddr->port;

+ cb = saddr->cb;

/* Look for a device with the right network number. */

dev = net2dev_map[addr.net];

@@ -350,7 +341,6 @@ static int econet_sendmsg(struct kiocb *

eb = (struct ec_cb *)&skb->cb;

- /* BUG: saddr may be NULL */

eb->cookie = saddr->cookie;

eb->sec = *saddr;

eb->sent = ec_tx_done;

@@ -669,6 +659,9 @@ static int ec_dev_ioctl(struct socket *s

err = 0;

switch (cmd) {

case SIOCSIFADDR:

+ if (!capable(CAP_NET_ADMIN))

+ return -EPERM;

+

edev = dev->ec_ptr;

if (edev == NULL) {

/* Magic up a new one. */