mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-15 14:22:32 +00:00
00de17fa46
Upstream-Status: Backport [533d881b0f&2782cb0495&10b3ebbe61&245ad744b5] Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
71 lines
1.9 KiB
Diff
71 lines
1.9 KiB
Diff
From 10b3ebbe61a7031a3dae97f05834442220447181 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@cryptomilk.org>
|
|
Date: Wed, 3 Jun 2020 10:10:11 +0200
|
|
Subject: [PATCH] buffer: Reformat ssh_buffer_add_data()
|
|
|
|
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
|
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
|
|
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
|
|
|
|
Upstream-Status: Backport [https://gitlab.com/libssh/libssh-mirror/-/commit/10b3ebbe61a7031a3dae97f05834442220447181]
|
|
CVE: CVE-2020-16135
|
|
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
|
---
|
|
src/buffer.c | 35 ++++++++++++++++++-----------------
|
|
1 file changed, 18 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/src/buffer.c b/src/buffer.c
|
|
index a2e6246af..476bc1358 100644
|
|
--- a/src/buffer.c
|
|
+++ b/src/buffer.c
|
|
@@ -299,28 +299,29 @@ int ssh_buffer_reinit(struct ssh_buffer_struct *buffer)
|
|
*/
|
|
int ssh_buffer_add_data(struct ssh_buffer_struct *buffer, const void *data, uint32_t len)
|
|
{
|
|
- buffer_verify(buffer);
|
|
+ buffer_verify(buffer);
|
|
|
|
- if (data == NULL) {
|
|
- return -1;
|
|
- }
|
|
+ if (data == NULL) {
|
|
+ return -1;
|
|
+ }
|
|
|
|
- if (buffer->used + len < len) {
|
|
- return -1;
|
|
- }
|
|
+ if (buffer->used + len < len) {
|
|
+ return -1;
|
|
+ }
|
|
|
|
- if (buffer->allocated < (buffer->used + len)) {
|
|
- if(buffer->pos > 0)
|
|
- buffer_shift(buffer);
|
|
- if (realloc_buffer(buffer, buffer->used + len) < 0) {
|
|
- return -1;
|
|
+ if (buffer->allocated < (buffer->used + len)) {
|
|
+ if (buffer->pos > 0) {
|
|
+ buffer_shift(buffer);
|
|
+ }
|
|
+ if (realloc_buffer(buffer, buffer->used + len) < 0) {
|
|
+ return -1;
|
|
+ }
|
|
}
|
|
- }
|
|
|
|
- memcpy(buffer->data+buffer->used, data, len);
|
|
- buffer->used+=len;
|
|
- buffer_verify(buffer);
|
|
- return 0;
|
|
+ memcpy(buffer->data + buffer->used, data, len);
|
|
+ buffer->used += len;
|
|
+ buffer_verify(buffer);
|
|
+ return 0;
|
|
}
|
|
|
|
/**
|
|
--
|
|
GitLab
|
|
|