sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dropbear: Do not use getpwnam()

Browse Source
This commit is contained in:
Tee KOBAYASHI 2021-12-15 10:36:15 +09:00 committed by Leonid Pliushch
parent a1f7307352
commit a016a0d6ae
4 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/dropbear/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Small SSH server and client"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2020.81
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b
TERMUX_PKG_DEPENDS="termux-auth, zlib"

12
packages/dropbear/common-session.c.patch
View File

@ -27,3 +27,15 @@ diff -u -r ../dropbear-2019.77/common-session.c ./common-session.c
} else {
return ses.authstate.pw_shell;
}
@@ -628,7 +618,11 @@
if (ses.authstate.pw_passwd)
m_free(ses.authstate.pw_passwd);
+#ifdef __ANDROID__
+ pw = getpwuid(getuid());
+#else
pw = getpwnam(username);
+#endif
if (!pw) {
return;
}

14
packages/dropbear/loginrec.c.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/loginrec.c
+++ b/loginrec.c
@@ -275,7 +275,11 @@
if (username) {
strlcpy(li->username, username, sizeof(li->username));
+#ifdef __ANDROID__
+ pw = getpwuid(getuid());
+#else
pw = getpwnam(li->username);
+#endif
if (pw == NULL)
dropbear_exit("login_init_entry: Cannot find user \"%s\"",
li->username);

18
packages/dropbear/svr-chansession.c.patch
View File

@ -1,7 +1,19 @@
diff -uNr dropbear-2018.76/svr-chansession.c dropbear-2018.76.mod/svr-chansession.c
--- dropbear-2018.76/svr-chansession.c 2018-02-27 16:25:12.000000000 +0200
+++ dropbear-2018.76.mod/svr-chansession.c 2018-04-21 13:45:06.707063974 +0300
@@ -919,6 +919,8 @@
@@ -607,7 +607,11 @@
dropbear_exit("Out of memory"); /* TODO disconnect */
}
+#ifdef __ANDROID__
+ pw = getpwuid(getuid());
+#else
pw = getpwnam(ses.authstate.pw_name);
+#endif
if (!pw)
dropbear_exit("getpwnam failed after succeeding previously");
pty_setowner(pw, chansess->tty);
@@ -919,6 +923,8 @@
#endif
/* clear environment */
@ -10,7 +22,7 @@ diff -uNr dropbear-2018.76/svr-chansession.c dropbear-2018.76.mod/svr-chansessio
/* if we're debugging using valgrind etc, we need to keep the LD_PRELOAD
* etc. This is hazardous, so should only be used for debugging. */
#ifndef DEBUG_VALGRIND
@@ -931,6 +933,7 @@
@@ -931,6 +937,7 @@
}
#endif /* HAVE_CLEARENV */
#endif /* DEBUG_VALGRIND */
@ -18,7 +30,7 @@ diff -uNr dropbear-2018.76/svr-chansession.c dropbear-2018.76.mod/svr-chansessio
/* We can only change uid/gid as root ... */
if (getuid() == 0) {
@@ -956,12 +959,14 @@
@@ -956,12 +963,14 @@
}
}