summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Collapse)AuthorAgeFilesLines
* toolbox: hide property implementation from watchpropsColin Cross2013-06-171-17/+16
| | | | Change-Id: Ia6609116d641d3354971ca40a16ffcab38484150
* am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q ↵Brian Carlstrom2013-06-041-2/+2
|\ | | | | | | | | | | | | Send-Q columns" * commit '603746f0e3b645954f33be36f7602cc8205cb71c': Fixed reversed output in netstat Recv-Q Send-Q columns
| * am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"Brian Carlstrom2013-06-041-2/+2
| |\ | | | | | | | | | | | | * commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071': Fixed reversed output in netstat Recv-Q Send-Q columns
| | * Fixed reversed output in netstat Recv-Q Send-Q columnsBrian Carlstrom2013-06-031-2/+2
| | | | | | | | | | | | Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
* | | fix another misuse of strncatNick Kralevich2013-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | This has the potential to overflow "buffer" if the command line is more than 4K. Change-Id: Icdfed0d9d21804f290b75787ef3809e0475b14f0
* | | fix strncat misuseNick Kralevich2013-06-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The third argument of strncat() tells how much data to append from src, not the total size of the buffer. Change uses of strncat() to strlcat(), which has the buffer overflow protection behavior intended by the original author. This fixes the following compiler warning: In function 'strncat', inlined from 'print_type' at system/core/toolbox/lsof.c:76:12: bionic/libc/include/string.h:142:5: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default] Change-Id: Id69edc641de3cb87d1867a409cd57b04b12f90a7
* | | Merge "fs_mgr: make block devices read-only"Nick Kralevich2013-04-251-0/+22
|\ \ \
| * | | fs_mgr: make block devices read-onlyNick Kralevich2013-04-241-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a filesystem is mounted read-only, make the underlying block device read-only too. This helps prevent an attacker who is able to change permissions on the files in /dev (for example, symlink attack) from modifying the block device. In particular, this change would have stopped the LG Thrill / Optimus 3D rooting exploit (http://vulnfactory.org/blog/2012/02/26/rooting-the-lg-thrill-optimus-3d/) as that exploit modified the raw block device corresponding to /system. This change also makes UID=0 less powerful. Block devices cannot be made writable again without CAP_SYS_ADMIN, so an escalation to UID=0 by itself doesn't give full root access. adb/mount: Prior to mounting something read-write, remove the read-only restrictions on the underlying block device. This avoids messing up developer workflows. Change-Id: I135098a8fe06f327336f045aab0d48ed9de33807
* | | | am 4c1840e6: am 5ea58543: Merge "mount: fix incorrect string length calculation"Nick Kralevich2013-04-241-3/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '4c1840e6547266ba251d8c34905036d73240ff57': mount: fix incorrect string length calculation
| * | am 5ea58543: Merge "mount: fix incorrect string length calculation"Nick Kralevich2013-04-241-3/+4
| |\ \ | | |/ | | | | | | | | | * commit '5ea58543154a97c42c0b7fc58c2639a4fea64f5b': mount: fix incorrect string length calculation
| | * mount: fix incorrect string length calculationNick Kralevich2013-04-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug https://code.google.com/p/android/issues/detail?id=54192 which incorrectly calculated the length of a string. Fix compiler warning: system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default] system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default] Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
* | | am 03546553: am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"Colin Cross2013-04-181-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit '03546553205b56fc1ba0318b146971f43f54a155': use lseek64 to resolve offset oveflow
| * | am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"Colin Cross2013-04-181-4/+4
| |\ \ | | |/ | | | | | | | | | * commit 'b73a0ef4d05ad594ba07b98e1f4aa7fe66a18c2e': use lseek64 to resolve offset oveflow
| | * use lseek64 to resolve offset oveflowJongrak Kwon2013-04-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The offset variable in lseek is 32 bit and get easily overflow when accessing with large offset in dd command. Use lseek64 to resolve it. Change-Id: Ib75d9dcb587004a6851365ab5bb8584ce1010b57
* | | am 129b6d90: am 083b5ccb: Add liblogYing Wang2013-04-091-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '129b6d907b3c32a0f0a2e4fc585502484d47a1e4': Add liblog
| * | am 083b5ccb: Add liblogYing Wang2013-04-091-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27': Add liblog
| | * | Add liblogYing Wang2013-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 8580410 Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
* | | | am d3859e43: am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd3859e433d5a4e0da3f24851c5f5f6c9c8b97849': toolbox/dmesg: do not hardcode KLOG_BUF_LEN
| * | | am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '6e0b9ecb503b5611d815214e0a134ea0b1395089': toolbox/dmesg: do not hardcode KLOG_BUF_LEN
| | * | Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| | |\ \
| | | * | toolbox/dmesg: do not hardcode KLOG_BUF_LENJames Sullins2013-04-011-6/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
* | | | | am a7096004: am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a7096004f220dd7578d7b2e26a3513fa5efc0fc1': Add -i option to toolbox cmd ls
| * | | | am 911ba269: Merge "Add -i option to toolbox cmd ls"Geremy Condra2013-04-041-36/+44
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit '911ba269e369035f9a4a250fa22233b37d724356': Add -i option to toolbox cmd ls
| | * | Add -i option to toolbox cmd lsWilliam Roberts2013-04-031-36/+44
| | |/ | | | | | | | | | Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
* | | toolbox: Make reboot a separate command from toolboxBenoit Goby2013-03-262-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | Set the CAP_SYS_BOOT filesystem capability on the new reboot command and keep CAP_SYS_BOOT in adb bounding set so that the shell user can run it. Change-Id: I1dd6143445ee2a952254f0452ab6e544318431dd
* | | toolbox: Fix rm -f with multiple filesBenoit Goby2013-03-251-2/+2
|/ / | | | | | | | | | | | | Only check errno if unlink returns -1. Continue instead of exiting if one file does not exist. Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b
* | toolbox: renice: Add -t TYPE parameter and switch to getoptDmitry Shmidt2013-01-221-24/+40
| | | | | | | | | | Change-Id: Idaedabe1505a9c373629ef1fd31aa4b4beb068c2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am 7ec62dbd: am 82ea44f8: Merge "Change setsebool syntax to be consistent ↵Dima Zavin2012-12-191-24/+15
|\ \ | |/ | | | | | | | | | | with other init built-ins." * commit '7ec62dbd9d2bd7369fa074bf002f642b03e6dd39': Change setsebool syntax to be consistent with other init built-ins.
| * Merge "Change setsebool syntax to be consistent with other init built-ins."Dima Zavin2012-12-181-24/+15
| |\
| | * Change setsebool syntax to be consistent with other init built-ins.Stephen Smalley2012-12-131-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change setsebool syntax from name=value to name value. This is to make it consistent with setprop and similar commands. Update both the init built-in command and the toolbox command for consistency. Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | am b8db1e09: am 777991d9: Merge "Fixed improper size displaying in \'df\' ↵Elliott Hughes2012-12-031-5/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | utility" * commit 'b8db1e093d412f57263dc597dbac14c377945781': Fixed improper size displaying in 'df' utility
| * | Merge "Fixed improper size displaying in 'df' utility"Elliott Hughes2012-12-031-5/+11
| |\ \ | | |/ | |/|
| | * Fixed improper size displaying in 'df' utilityMichal Frynas2012-10-021-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'df' command used to display filesystem usage statistics as integer values, in most cases rounding the actual value down. Because of that 'df' tended to display faulty size values. This fix to 'df' utility calculates the fractional part of the size, then it rounds it when needed to the nearest one-digit integer value and displays after decimal dot. Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
* | | resolved conflicts for merge of 20f5daa8 to masterKenny Root2012-10-163-30/+6
|\ \ \ | |/ / | | | | | | Change-Id: Ie3e67696d265a56dfa4d089c777506f27783a9a6
| * | resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aospKenny Root2012-10-163-30/+6
| |\ \ | | | | | | | | | | | | Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
| | * | Remove HAVE_SELINUX guardsKenny Root2012-10-163-30/+6
| | | | | | | | | | | | | | | | Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
* | | | am e47eb98a: am 674c0445: Merge "toolbox: silence some compiler warnings"Kenny Root2012-10-111-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e47eb98a337081d0d6c740eb7d8b990faf4090d7': toolbox: silence some compiler warnings
| * | | am 674c0445: Merge "toolbox: silence some compiler warnings"Kenny Root2012-10-111-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0': toolbox: silence some compiler warnings
| | * | toolbox: silence some compiler warningsKenny Root2012-10-101-3/+3
| | |/ | | | | | | | | | | | | | | | | | | Comparison of signed and unsigned integers. Use parenthesis around a group of bitwise OR operations. Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
* | | am 08f748a2: am 42a1e6c9: Merge "Iteration on multi-user external storage." ↵Jeff Sharkey2012-08-221-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr1-dev * commit '08f748a2f8e6933fdd96290de049c1aa1f3f8479': Iteration on multi-user external storage.
| * | Iteration on multi-user external storage.Jeff Sharkey2012-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define /storage as top-level concept, so that we enforce permissions uniformly. Moves external storage paths from headers to per-device environment variables. Added missing mount flags, and we no longer have adb-specific external storage. Bug: 6925012 Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
* | | am 81eecb1e: am 2ab69388: am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"Jean-Baptiste Queru2012-08-201-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '81eecb1eb8c23e603c78d60a7278a3afd1798962': vmstat: Fix -n flag
| * | am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"Jean-Baptiste Queru2012-08-201-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad': vmstat: Fix -n flag
| | * Merge "vmstat: Fix -n flag"Jean-Baptiste Queru2012-08-201-2/+2
| | |\
| | | * vmstat: Fix -n flagArun Raghavan2012-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | The loop condition for the number of iterations basically caused the argument to -n to be ignored. This fixes the condition appropriately.
* | | | Merge "Make usage() static in du.c to avoid conflicts"Jon Larimer2012-08-141-2/+2
|\ \ \ \
| * | | | Make usage() static in du.c to avoid conflictsJon Larimer2012-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic6b036d050943fb5f0af8553c081ca75362167e8
* | | | | am f48a4b4b: am ba822edb: am 02e9f8d5: am 53dab583: Merge "Make setenforce ↵Kenny Root2012-08-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | usage function static." * commit 'f48a4b4be699f63670acbff94b78e1fdf3b4338c': Make setenforce usage function static.
| * | | | am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static."Kenny Root2012-08-131-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c': Make setenforce usage function static.
| | * | | Make setenforce usage function static.Matt Finifter2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6de204dc072418805160a35d799b8948ecb39251