diff --git a/[refs] b/[refs]
index 62d556874d13..b1ff2a7ec4df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efc463eb508798da4243625b08c7396462cabf9f
+refs/heads/master: 37f9fc452d138dfc4da2ee1ce5ae85094efc3606
diff --git a/trunk/net/irda/iriap.c b/trunk/net/irda/iriap.c
index fce364c6c71a..5b743bdd89ba 100644
--- a/trunk/net/irda/iriap.c
+++ b/trunk/net/irda/iriap.c
@@ -502,7 +502,8 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
 		IRDA_DEBUG(4, "%s(), strlen=%d\n", __func__, value_len);
 
 		/* Make sure the string is null-terminated */
-		fp[n+value_len] = 0x00;
+		if (n + value_len < skb->len)
+			fp[n + value_len] = 0x00;
 		IRDA_DEBUG(4, "Got string %s\n", fp+n);
 
 		/* Will truncate to IAS_MAX_STRING bytes */