diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2019-08-21 18:27:23 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-09-24 19:09:08 +0000 |
| commit | 99691949a55113ec7d110da0f6d5430462286c8c (patch) | |
| tree | 403c79dc2e8a7939d40d946776aeed03877c4d88 /src/vcl | |
| parent | 2e0f929b60073b97be0ffdc2d9523cc6c8e6368b (diff) | |
vcl: fix ldp_set_app_name overflow
In case of overflow, we null-terminate the parameter ('app_name')
instead of ldp global name ('ldp->app_name').
Moreover, snprintf() always safely null-terminate the destination string
even in case of overflow.
Type: fix
Fixes: 048b1d6ab7
Change-Id: I4d8b0e020a228e982b6699d652b341c5afe92993
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 747b3d8b0e045edb166738ecde99dcc951212988)
Diffstat (limited to 'src/vcl')
| -rw-r--r-- | src/vcl/ldp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index 70a4299083e..7aa38305249 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -132,11 +132,8 @@ ldp_worker_get_current (void) static inline void ldp_set_app_name (char *app_name) { - int rv = snprintf (ldp->app_name, LDP_APP_NAME_MAX, - "ldp-%d-%s", getpid (), app_name); - - if (rv >= LDP_APP_NAME_MAX) - app_name[LDP_APP_NAME_MAX - 1] = 0; + snprintf (ldp->app_name, LDP_APP_NAME_MAX, + "ldp-%d-%s", getpid (), app_name); } static inline char * |