diff --git a/[refs] b/[refs]
index c3caeeb6b923..37e1bc3c9082 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8550be08cbed164a8357491cc2c27cb99282b7ff
+refs/heads/master: 447ff8865209e48e231de804c47eb4677f2318be
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_mlme.c b/trunk/drivers/staging/rtl8712/rtl871x_mlme.c
index c475b961308e..ef8eb6c7ee41 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -1281,12 +1281,16 @@ sint r8712_set_key(struct _adapter *adapter,
 			psecuritypriv->DefKey[keyid].skey, keylen);
 		break;
 	case _TKIP_:
+		if (keyid < 1 || keyid > 2)
+			return _FAIL;
 		keylen = 16;
 		memcpy(psetkeyparm->key,
 			&psecuritypriv->XGrpKey[keyid - 1], keylen);
 		psetkeyparm->grpkey = 1;
 		break;
 	case _AES_:
+		if (keyid < 1 || keyid > 2)
+			return _FAIL;
 		keylen = 16;
 		memcpy(psetkeyparm->key,
 			&psecuritypriv->XGrpKey[keyid - 1], keylen);