Commit Graph

2799 Commits

Author SHA1 Message Date
Nick Kralevich d94bbc326a am 6bc08280: Validate sender credentials on netlink msg receive
* commit '6bc08280108d020edfceff039f3955eebdc1e45c':
  Validate sender credentials on netlink msg receive
2011-04-19 15:37:03 -07:00
Dima Zavin 4fab9ac04e libcutils: hashmap: save next pointer in forEach before calling callback
If the callback passed to forEach tries to remove the element it was passed,
there's a use-after-free of the entry pointer in forEach.

Change-Id: Ia364b4775c9c55780b23f683b30cbff511b7f944
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-19 15:16:18 -07:00
The Android Automerger e2f246e497 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-19 15:01:00 -07:00
Nick Kralevich 6bc0828010 Validate sender credentials on netlink msg receive
Verify that netlink messages are actually from the kernel,
and not from a userspace program.

This is a manual cherry-pick from b620a0b1c7

Change-Id: I237f0a5cb56393bb3aab64a7ae5898f2bdc95cef
2011-04-19 12:33:44 -07:00
Nick Kralevich c4956766c0 Validate sender credentials on netlink msg receive
Verify that netlink messages are actually from the kernel,
and not from a userspace program.

Change-Id: I709c0efe9ba0258f6d79ebcde531d7f7bbe780b2
2011-04-18 20:13:25 -07:00
Nick Kralevich 4aadb7f6df am b620a0b1: Validate sender credentials on netlink msg receive
* commit 'b620a0b1c7ae486e979826200e8e441605b0a5d6':
  Validate sender credentials on netlink msg receive
2011-04-18 16:29:45 -07:00
Nick Kralevich b620a0b1c7 Validate sender credentials on netlink msg receive
Verify that netlink messages are actually from the kernel,
and not from a userspace program.

Change-Id: I709c0efe9ba0258f6d79ebcde531d7f7bbe780b2
2011-04-18 15:55:59 -07:00
David 'Digit' Turner 39764f41a5 pixelflinger: Provide more scanline shortcut functions.
This patch adds a dozen more "shortcut" scanline-processing functions
to pixel-flingers. All of them avoid using the JIT for the corresponding
operation (on ARM), or using the generic and _extremely_ slow 'scanline'
function (on x86, where there is no JIT).

The shortcuts were selected by running the system under emulation
(build full_x86-eng, then launch emulator-x86), and correspond to
operations that are in use when using the system's typical UI features.

This makes it much more responsive and amenable to testing most
applications, at least those that don't use OpenGL ES heavily.

Note that HW OpenGLES emulation is under completion and should solve this
problem entirely, though is not there yet.

Change-Id: I9c73ba21ad158d6cc5532fabe7ed2419e00ecb3f
2011-04-16 13:13:58 +02:00
The Android Automerger a0d8f0def7 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-15 20:02:01 -07:00
Irfan Sheriff bdaaec1ba0 Use DHCP server as gateway when it is absent
Some routers can return 0.0.0.0 as gateway address,
use DHCP server as gateway in such instances

Change-Id: I7e8db8e619475efce53ce391f77f2c13c3b7268c
2011-04-15 16:35:59 -07:00
The Android Automerger 596a670c31 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-13 12:40:48 -07:00
JP Abgrall 112445b8a7 adb: Don't allow a forced exit if data is still in the socket
Fixes the  http://b/4271011 "adb shell cat /init.rc output gets truncated"


Change-Id: I6df64374b60789595fb18f96d429315dec032443
Signed-off-by: JP Abgrall <jpa@google.com>
2011-04-12 22:01:58 -07:00
Carl Shapiro f098c159e3 Merge "Make atomic-inline.h usable from ordinary C++ code." 2011-04-12 16:13:36 -07:00
Carl Shapiro b60d9ce1fc Make atomic-inline.h usable from ordinary C++ code.
Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
2011-04-11 20:00:42 -07:00
Jake Hamby 6f49d5f266 Add missing function required to load Crespo RIL library.
ifc_set_mask() function was removed in a previous change. This function
is called by the Crespo RIL, so we can't remove it yet.

Bug: 4268537
Change-Id: I634580ee8d2a1aff069178837cc121c89c5e73f9
2011-04-11 19:46:41 -07:00
Mike Lockwood 203f9513fd am 0ffe483a: am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
* commit '0ffe483a6a9191fc6da031bbcdbdc50f6f64bdf0':
  In serial, skip over port as well if numbers found after colon.
2011-04-11 15:08:00 -07:00
Ken Sumrall 91758c1746 Merge "Add the touch command to toolbox." 2011-04-11 15:03:29 -07:00
Mike Lockwood 0ffe483a6a am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
* commit 'e4bcf8305748e8799df9047fb0f6881553dd43b5':
  In serial, skip over port as well if numbers found after colon.
2011-04-11 14:55:01 -07:00
Carl-Emil Lagerstedt 9ab8190e41 Fix build error in init when building with bootchart
There was a build error in init.c if you enabled bootchart, this
should probably be shipped upstream if not fixed already.

Change-Id: Iea3451c3e15d5cac00c5420d99bfce9a950aaaac
2011-04-11 14:17:54 +02:00
Brian Carlstrom 6541ef1562 Add keychain user
Change-Id: Id6738d7c97dd58b2043e2cba018797e3b2b4d77a
2011-04-08 14:06:16 -07:00
The Android Automerger 8b0c302a87 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-07 18:37:35 -07:00
The Android Automerger 0abfc5659b merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-07 11:45:59 -07:00
Mike Lockwood e4bcf83057 am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
* commit 'd37e0840d75ef133083181f9f95dff9aa46a1b16':
  In serial, skip over port as well if numbers found after colon.
2011-04-06 07:55:00 -07:00
Mike Lockwood d37e0840d7 Merge "In serial, skip over port as well if numbers found after colon." 2011-04-06 07:25:31 -07:00
Terence Haddock e994f18c53 In serial, skip over port as well if numbers found after colon.
Change-Id: Icd45f570a9527790eb0cd614a3f77da1a72375b1
2011-04-06 16:18:25 +02:00
Ken Sumrall 795165bc15 Add the touch command to toolbox.
I wrote this to test my fix to support utime(2) system calls in the
sdcard fuse filesystem for stingray, and decided to finish sprucing
it up and make it part of toolbox.  In an effort to keep it small,
it doesn't accept dates a la touch, but just a time_t value.

Change-Id: I5dd011cd2e34d0cc605d6f40e46b96a8c949f194
2011-04-05 20:50:03 -07:00
The Android Automerger 6f9adeb85e merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-05 15:30:16 -07:00
Jeff Hamilton 18247d74be am ee3420bc: resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
* commit 'ee3420bc124613827af474684c3015d12742c70d':
  Make the NFC UID forward compatible.
2011-04-05 10:42:19 -07:00
Jeff Hamilton ee3420bc12 resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
2011-04-05 12:32:50 -05:00
Wink Saville 32e834b63b am b6623abc: am b98762f7: Teach fastboot to allow required variables per product.
* commit 'b6623abc414ea2a1d1ac3cbfef0c435e3b7e8987':
  Teach fastboot to allow required variables per product.
2011-04-05 10:28:28 -07:00
Wink Saville b6623abc41 am b98762f7: Teach fastboot to allow required variables per product.
* commit 'b98762f7824c291dc5d9a9b757af434ef31d8c81':
  Teach fastboot to allow required variables per product.
2011-04-04 19:36:27 -07:00
The Android Automerger e10e16983d merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-04 19:14:33 -07:00
Wink Saville b98762f782 Teach fastboot to allow required variables per product.
This is needed for products like xoom-cdma and xoom-cdma-lte.
The xoom-cdma-lte product requires an lte baseband binary but
it's not needed for xoom-cdma.

This is implemented by allowing an optional product parameter
to "required" statements. The parameter is separated from
"required" by a colon so the version-baseband-2 requirment in
board-info.txt for stingray becomes:

 require-for-product:xoom-cdma-lte version-baseband-2=ltedc_u_03.25.00|ltedc_u_03.19.00

In the above statement, only xoom-cdma-lte requires version-baseband-2
and the baseband can be lte_u_03.25.00 or lte_u_03.19.00. For other
products version-baseband-2 will be ignored.


Change-Id: I786bec5f5661c2243d87925b064fc6124d3cffa1
2011-04-04 17:54:59 -07:00
Jeff Hamilton 65475f89e1 am 336bc321: Make the NFC UID forward compatible.
* commit '336bc321a6e978a273098148e13a82c5e7ec3be5':
  Make the NFC UID forward compatible.
2011-04-04 14:42:38 -07:00
The Android Automerger 151fae8e12 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-01 13:11:44 -07:00
Brad Fitzpatrick d6efa45489 am 80337ffc: am 47e4ee59: am 71ead183: Close the client socket early for ctl.* properties.
* commit '80337ffcf45205750b8b90cbbe28c4c8e7e2baff':
  Close the client socket early for ctl.* properties.
2011-04-01 12:27:04 -07:00
Brad Fitzpatrick 80337ffcf4 am 47e4ee59: am 71ead183: Close the client socket early for ctl.* properties.
* commit '47e4ee5958bfd48c741f17c23b3a4a3f7866416e':
  Close the client socket early for ctl.* properties.
2011-04-01 12:25:46 -07:00
Brad Fitzpatrick 47e4ee5958 am 71ead183: Close the client socket early for ctl.* properties.
* commit '71ead1835317af5305f9ef87ce06ebdf9cff92e6':
  Close the client socket early for ctl.* properties.
2011-04-01 12:24:10 -07:00
Brad Fitzpatrick 71ead18353 Close the client socket early for ctl.* properties.
Bug: 4199411
Change-Id: I3bf335e16e0df8405c538989a8f4f6db7795fa36
2011-04-01 12:00:35 -07:00
Jeff Hamilton 336bc321a6 Make the NFC UID forward compatible.
Change-Id: Icfa302c22151b3d722ad0da7e58806f74730e1a3
2011-04-01 13:43:01 -05:00
The Android Automerger a084db0890 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-03-31 18:44:56 -07:00
Colin Cross ab0c4e0356 Merge "ueventd: track platform device uevents to parse block device names" 2011-03-31 17:01:26 -07:00
Colin Cross 320cbfa719 Merge "ueventd: refactor uevent handling" 2011-03-31 17:01:13 -07:00
Colin Cross fadb85e3bd ueventd: track platform device uevents to parse block device names
The mmc block devices on panda boards use a platform device called
omap/omap_hsmmc.0.  The number of path entries in the uevent after
the platform device is unknown, and the number of path entries in
the platform device is unknown, so the only way to determine how
many entries make up the platform device is to compare against
a list of platform devices.

Add a list of platform devices that have been registered, and
iterate through it to determine the platform device portion of
a block device uevent.

Change-Id: I1480bc6429172ca6997d548787be3863ce062472
2011-03-31 16:44:04 -07:00
Colin Cross eb5ba83065 ueventd: refactor uevent handling
Change-Id: I2002be3580ff87b0a55dc030a9099bf6d795011f
2011-03-31 16:37:20 -07:00
Lorenzo Colitti 7b43eb1224 am e9fa47ca: am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
* commit 'e9fa47ca664577e4ca7ed270f1f72a2d43fb3423':
  Kill IPv6 sockets as well as IPv4 sockets.
2011-03-30 17:36:37 -07:00
Lorenzo Colitti e9fa47ca66 am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
* commit '0dd572a5196f7887de56912b6f2a22f053f1ca34':
  Kill IPv6 sockets as well as IPv4 sockets.
2011-03-30 17:34:30 -07:00
Lorenzo Colitti 0dd572a519 Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE 2011-03-30 17:26:15 -07:00
Brad Fitzpatrick a8bf832462 am 719e4048: am 9cbac1fc: am 9f1e0e3a: Close the property socket *after* updating properties.
* commit '719e40484fa13ecd0b1645c7a7a5d01d5845731a':
  Close the property socket *after* updating properties.
2011-03-30 16:41:33 -07:00
Jeff Hamilton 124d1931ba am 99f28ca6: am be61f39a: (-s ours) am a6a36c0b: Update the value for the NFC shared UID.
* commit '99f28ca6ddc4c1010ecac7420fb23dd8038c8abc':
  Update the value for the NFC shared UID.
2011-03-30 16:33:43 -07:00