Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 2 deletions

diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index 3ff42f4437f3..695389a4fc23 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -335,9 +335,21 @@ try_again:
         return u_len;
 }
 
-int udf_CS0toUTF8(uint8_t *utf_o, int o_len, const uint8_t *ocu_i, int i_len)
+int udf_dstrCS0toUTF8(uint8_t *utf_o, int o_len,
+                      const uint8_t *ocu_i, int i_len)
 {
-        return udf_name_from_CS0(utf_o, o_len, ocu_i, i_len,
+        int s_len = 0;
+
+        if (i_len > 0) {
+                s_len = ocu_i[i_len - 1];
+                if (s_len >= i_len) {
+                        pr_err("incorrect dstring lengths (%d/%d)\n",
+                               s_len, i_len);
+                        return -EINVAL;
+                }
+        }
+
+        return udf_name_from_CS0(utf_o, o_len, ocu_i, s_len,
                                  udf_uni2char_utf8, 0);
 }