odp_packet_socket.c: Fix unterminated string

Message ID	1413575257-40398-1-git-send-email-mike.holmes@linaro.org
State	Accepted
Commit	ee2ee879247668fcc8bb715f3513ed708d74751d
Headers	show Return-Path: <patchwork-forward+bncBCT4HJVWSENBB47EQWRAKGQEPCXW4BQ@linaro.org> Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; From: Mike Holmes <mike.holmes@linaro.org> To: lng-odp@lists.linaro.org Date: Fri, 17 Oct 2014 15:47:37 -0400 Message-Id: <1413575257-40398-1-git-send-email-mike.holmes@linaro.org> Subject: [lng-odp] [PATCH] odp_packet_socket.c: Fix unterminated string Precedence: list MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit

Message ID

1413575257-40398-1-git-send-email-mike.holmes@linaro.org

State

Accepted

Commit

ee2ee879247668fcc8bb715f3513ed708d74751d

Headers

Received-SPF: pass (google.com: domain of
	patch+caf_=patchwork-forward=linaro.org@linaro.org designates
	209.85.215.49 as permitted sender) client-ip=209.85.215.49; 
Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not
	designate permitted sender hosts) client-ip=54.225.227.206; 
From: Mike Holmes <mike.holmes@linaro.org>
To: lng-odp@lists.linaro.org
Date: Fri, 17 Oct 2014 15:47:37 -0400
Message-Id: <1413575257-40398-1-git-send-email-mike.holmes@linaro.org>
Subject: [lng-odp] [PATCH] odp_packet_socket.c: Fix unterminated string
Precedence: list
MIME-Version: 1.0
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: lng-odp-bounces@lists.linaro.org
Mailing-list: list patchwork-forward@linaro.org;
	contact patchwork-forward+owners@linaro.org
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Termination of the string is not assured unless the string is one char shorter than the buffer. Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- platform/linux-generic/odp_packet_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maxim Uvarov Oct. 21, 2014, 12:08 p.m. UTC | #1

merged!
Maxim.

On 10/17/2014 11:47 PM, Mike Holmes wrote:
> Termination of the string is not assured unless the string is
> one char shorter than the buffer.
>
> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
> ---
>   platform/linux-generic/odp_packet_socket.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c
> index 006d7bd..da9b5a0 100644
> --- a/platform/linux-generic/odp_packet_socket.c
> +++ b/platform/linux-generic/odp_packet_socket.c
> @@ -219,7 +219,7 @@ int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev,
>   
>   	/* get if index */
>   	memset(&ethreq, 0, sizeof(struct ifreq));
> -	strncpy(ethreq.ifr_name, netdev, IFNAMSIZ);
> +	strncpy(ethreq.ifr_name, netdev, IFNAMSIZ-1);
>   	err = ioctl(sockfd, SIOCGIFINDEX, &ethreq);
>   	if (err != 0) {
>   		perror("setup_pkt_sock() - ioctl(SIOCGIFINDEX)");

diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c
index 006d7bd..da9b5a0 100644
--- a/platform/linux-generic/odp_packet_socket.c
+++ b/platform/linux-generic/odp_packet_socket.c
@@ -219,7 +219,7 @@  int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev,
 
 	/* get if index */
 	memset(&ethreq, 0, sizeof(struct ifreq));
-	strncpy(ethreq.ifr_name, netdev, IFNAMSIZ);
+	strncpy(ethreq.ifr_name, netdev, IFNAMSIZ-1);
 	err = ioctl(sockfd, SIOCGIFINDEX, &ethreq);
 	if (err != 0) {
 		perror("setup_pkt_sock() - ioctl(SIOCGIFINDEX)");

odp_packet_socket.c: Fix unterminated string

Commit Message

Comments

Patch