Bluetooth: replace deprecated strncpy with strscpy_pad

strncpy() is deprecated for use on NUL-terminated destination strings [0]
and as such we should prefer more robust and less ambiguous string interfaces.

The CAPI (part II) [1] states that the manufacturer id should be a
"zero-terminated ASCII string" and should "always [be] zero-terminated."

Much the same for the serial number: "The serial number, a seven-digit
number coded as a zero-terminated ASCII string".

Along with this, its clear the original author intended for these
buffers to be NUL-padded as well. To meet the specification as well as
properly NUL-pad, use strscpy_pad().

In doing this, an opportunity to simplify this code is also present.
Remove the min_t() and combine the length check into the main if.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
Link: https://capi.org/downloads.html
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html
Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index f3bedc3b613ad08e28049f4446d0d67e20562a65..884703fda97972522190c8e9fe46b4b508479fd3 100644 (file)
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -248,18 +248,10 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
                        break;
 
                case CAPI_FUNCTION_GET_MANUFACTURER:
-                       if (skb->len < CAPI_MSG_BASELEN + 15)
-                               break;
-
-                       if (!info && ctrl) {
-                               int len = min_t(uint, CAPI_MANUFACTURER_LEN,
-                                               skb->data[CAPI_MSG_BASELEN + 14]);
-
-                               memset(ctrl->manu, 0, CAPI_MANUFACTURER_LEN);
-                               strncpy(ctrl->manu,
-                                       skb->data + CAPI_MSG_BASELEN + 15, len);
-                       }
-
+                       if (!info && ctrl && skb->len > CAPI_MSG_BASELEN + 14)
+                               strscpy_pad(ctrl->manu,
+                                           skb->data + CAPI_MSG_BASELEN + 15,
+                                           skb->data[CAPI_MSG_BASELEN + 14]);
                        break;
 
                case CAPI_FUNCTION_GET_VERSION:
@@ -276,18 +268,10 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
                        break;
 
                case CAPI_FUNCTION_GET_SERIAL_NUMBER:
-                       if (skb->len < CAPI_MSG_BASELEN + 17)
-                               break;
-
-                       if (!info && ctrl) {
-                               int len = min_t(uint, CAPI_SERIAL_LEN,
-                                               skb->data[CAPI_MSG_BASELEN + 16]);
-
-                               memset(ctrl->serial, 0, CAPI_SERIAL_LEN);
-                               strncpy(ctrl->serial,
-                                       skb->data + CAPI_MSG_BASELEN + 17, len);
-                       }
-
+                       if (!info && ctrl && skb->len > CAPI_MSG_BASELEN + 16)
+                               strscpy_pad(ctrl->serial,
+                                           skb->data + CAPI_MSG_BASELEN + 17,
+                                           skb->data[CAPI_MSG_BASELEN + 16]);
                        break;
                }