From 9ad30c5bedbb6f09e77f51d19faf416046196c36851187d57bd5ab7136045bc1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 14 May 2010 22:29:46 +0000 Subject: [PATCH] Accepting request 40041 from Base:System Copy from Base:System/openssh based on submit request 40041 from user anicka OBS-URL: https://build.opensuse.org/request/show/40041 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=42 --- openssh-5.4p1-sftp-leak.diff | 12 ++++++++++++ openssh-askpass-gnome.spec | 2 +- openssh.changes | 5 +++++ openssh.spec | 4 +++- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 openssh-5.4p1-sftp-leak.diff diff --git a/openssh-5.4p1-sftp-leak.diff b/openssh-5.4p1-sftp-leak.diff new file mode 100644 index 0000000..968cfdc --- /dev/null +++ b/openssh-5.4p1-sftp-leak.diff @@ -0,0 +1,12 @@ +Index: openssh-5.4p1/sftp-client.c +=================================================================== +--- openssh-5.4p1.orig/sftp-client.c ++++ openssh-5.4p1/sftp-client.c +@@ -713,6 +713,7 @@ do_realpath(struct sftp_conn *conn, char + u_int status = buffer_get_int(&msg); + + error("Couldn't canonicalise: %s", fx2txt(status)); ++ buffer_free(&msg); + return(NULL); + } else if (type != SSH2_FXP_NAME) + fatal("Expected SSH2_FXP_NAME(%u) packet, got %u", diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index dd5eb71..5a799fe 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -23,7 +23,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev License: BSD3c(or similar) Group: Productivity/Networking/SSH Version: 5.4p1 -Release: 3 +Release: 4 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH diff --git a/openssh.changes b/openssh.changes index e33f5b6..a3b8fa2 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 14 16:03:17 CEST 2010 - anicka@suse.cz + +- fixed memory leak in sftp (bnc#604274) + ------------------------------------------------------------------- Fri Apr 23 12:01:50 CEST 2010 - anicka@suse.cz diff --git a/openssh.spec b/openssh.spec index 69d0c38..febc64c 100644 --- a/openssh.spec +++ b/openssh.spec @@ -36,7 +36,7 @@ PreReq: pwdutils %insserv_prereq %fillup_prereq coreutils permissions Conflicts: nonfreessh AutoReqProv: on Version: 5.4p1 -Release: 3 +Release: 4 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -69,6 +69,7 @@ Patch16: %{name}-%{version}-pts.diff Patch17: %{name}-%{version}-forwards.diff Patch18: %{name}-%{version}-homechroot.patch Patch19: %{name}-%{version}-sshconfig-knownhostschanges.diff +Patch20: %{name}-%{version}-sftp-leak.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package askpass @@ -114,6 +115,7 @@ Window System passphrase dialog for OpenSSH. %patch17 %patch18 %patch19 +%patch20 -p1 cp -v %{SOURCE4} . cp -v %{SOURCE6} . cd ../x11-ssh-askpass-%{xversion}