2015-07-29 06:24:48

by Dohyun Pyun

Subject: [PATCH BLUEZ] android/pan: Fix not NULL terminating parsed string

From: DoHyun Pyun <[email protected]>

This patch prevents the possible not NULL terminating problem.
ifr_name's array size is IFNAMSIZ. So If BNEP_BRIDGE has IFNAMSIZ size,
the name string will be not NULL terminating.
---
android/pan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/pan.c b/android/pan.c
index 0bb576e..c40a6d3 100644
--- a/android/pan.c
+++ b/android/pan.c
@@ -88,7 +88,7 @@ static int set_forward_delay(int sk)
struct ifreq ifr;

memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, BNEP_BRIDGE, IFNAMSIZ);
+ strncpy(ifr.ifr_name, BNEP_BRIDGE, IFNAMSIZ - 1);
ifr.ifr_data = (char *) args;

if (ioctl(sk, SIOCDEVPRIVATE, &ifr) < 0) {
--
1.8.1.2

2015-07-29 07:29:33

by Szymon Janc

Subject: Re: [PATCH BLUEZ] android/pan: Fix not NULL terminating parsed string

Hi Dohyun Pyun,

On Wednesday 29 of July 2015 15:24:48 Dohyun Pyun wrote:
> From: DoHyun Pyun <[email protected]>
>
> This patch prevents the possible not NULL terminating problem.
> ifr_name's array size is IFNAMSIZ. So If BNEP_BRIDGE has IFNAMSIZ size,
> the name string will be not NULL terminating.
> ---
> android/pan.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/android/pan.c b/android/pan.c
> index 0bb576e..c40a6d3 100644
> --- a/android/pan.c
> +++ b/android/pan.c
> @@ -88,7 +88,7 @@ static int set_forward_delay(int sk)
> struct ifreq ifr;
>
> memset(&ifr, 0, sizeof(ifr));
> - strncpy(ifr.ifr_name, BNEP_BRIDGE, IFNAMSIZ);
> + strncpy(ifr.ifr_name, BNEP_BRIDGE, IFNAMSIZ - 1);
> ifr.ifr_data = (char *) args;
>
> if (ioctl(sk, SIOCDEVPRIVATE, &ifr) < 0) {

Patch applied, thanks.

--
BR
Szymon Janc