diff --git a/[refs] b/[refs]
index a26e2f26bd3b..b365af4132f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 203fe0d2e99598eb960baf2cc4b88b6e794e5a20
+refs/heads/master: a71b9978819ce25f911af16fc4d7b96fcdf665d4
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index a18eeb62f4ef..9c8eb09de1a6 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -2531,6 +2531,9 @@ static int slic_mac_set_address(struct net_device *dev, void *ptr)
 	if (!adapter)
 		return -EBUSY;
 
+	if (!is_valid_ether_addr(addr->sa_data))
+		return -EINVAL;
+
 	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 	memcpy(adapter->currmacaddr, addr->sa_data, dev->addr_len);