From: Kees Cook <keescook@chromium.org>
Date: Tue, 11 Mar 2014 20:26:16 +0000 (-0700)
Subject: usb: gadget: tcm_usb_gadget: stop format strings
X-Git-Tag: v3.12.20~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34c35bea71a94296342957750b8703cd80811ee9;p=thirdparty%2Fkernel%2Fstable.git

usb: gadget: tcm_usb_gadget: stop format strings

commit aba37fd975f0dd58e025c99c2a79b61b20190831 upstream.

This makes sure that the name coming out of configfs cannot be used
accidentally as a format string.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---

diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 0ff33396eef3a..d9e15e85258d9 100644
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -1613,7 +1613,7 @@ static struct se_wwn *usbg_make_tport(
 		return ERR_PTR(-ENOMEM);
 	}
 	tport->tport_wwpn = wwpn;
-	snprintf(tport->tport_name, sizeof(tport->tport_name), wnn_name);
+	snprintf(tport->tport_name, sizeof(tport->tport_name), "%s", wnn_name);
 	return &tport->tport_wwn;
 }