From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD21AC5CFFE for ; Tue, 11 Dec 2018 15:45:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F84021104 for ; Tue, 11 Dec 2018 15:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543140; bh=X49m9QNSEAEbJcdS4ld6MNewctKNPv/cFe2RSr7NKok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lm7JG/Hmd70ZGmr/Yq0RrvBy8mf3s9arx2t3yNmLSJo+dcU9xXrIAjtHt/gbG0lts +DHUOJ5D7kjLxCnNRu8FdRGDSvw0gmOAmxSmdpx/4SXXkvABJ/5U8gdPYaCzbsWl0e JZw+J8qHtMSk7D1MvUr6gcZ1PoB/hLOxA0sapHFc= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F84021104 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726791AbeLKPpj (ORCPT ); Tue, 11 Dec 2018 10:45:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:34042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728141AbeLKPpi (ORCPT ); Tue, 11 Dec 2018 10:45:38 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27DF720989; Tue, 11 Dec 2018 15:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543137; bh=X49m9QNSEAEbJcdS4ld6MNewctKNPv/cFe2RSr7NKok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WaxtJi1V9TEvsePa+XHseZzqnOdFakLMSO8MfwHHz4K+vQIuRr9Tosx+uIO/A+yvn nl4+noN9F50mCaZWyZw/4VoCJDc0EV+MLk758vlEEzgKW+FZwcjCT2YvwedQFh7eke AROepdAa8r+J6BAKFfQkLaNHnHjeXcJE/kDKW0mM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sultan Alsawaf , "David S. Miller" Subject: [PATCH 4.4 27/91] ip_tunnel: Fix name string concatenate in __ip_tunnel_create() Date: Tue, 11 Dec 2018 16:40:46 +0100 Message-Id: <20181211151608.023682244@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151606.026852373@linuxfoundation.org> References: <20181211151606.026852373@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sultan Alsawaf commit 000ade8016400d93b4d7c89970d96b8c14773d45 upstream. By passing a limit of 2 bytes to strncat, strncat is limited to writing fewer bytes than what it's supposed to append to the name here. Since the bounds are checked on the line above this, just remove the string bounds checks entirely since they're unneeded. Signed-off-by: Sultan Alsawaf Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -261,8 +261,8 @@ static struct net_device *__ip_tunnel_cr } else { if (strlen(ops->kind) > (IFNAMSIZ - 3)) goto failed; - strlcpy(name, ops->kind, IFNAMSIZ); - strncat(name, "%d", 2); + strcpy(name, ops->kind); + strcat(name, "%d"); } ASSERT_RTNL();