August 2008 - launchd-changes - lists.macosforge.org

[23659] branches/PR-5923864/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23659 http://trac.macosforge.org/projects/launchd/changeset/23659 Author: dsorresso(a)apple.com Date: 2008-08-14 14:03:13 -0700 (Thu, 14 Aug 2008) Log Message: ----------- Enabling auditing on all jobs. Modified Paths: -------------- branches/PR-5923864/launchd/src/launchd_core_logic.c Modified: branches/PR-5923864/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-5923864/launchd/src/launchd_core_logic.c 2008-08-14 19:17:25 UTC (rev 23658) +++ branches/PR-5923864/launchd/src/launchd_core_logic.c 2008-08-14 21:03:13 UTC (rev 23659) @@ -475,6 +475,7 @@ static bool job_setup_machport(job_t j); static void job_setup_fd(job_t j, int target_fd, const char *path, int flags); static void job_postfork_become_user(job_t j); +static void job_enable_audit_for_user(job_t j, uid_t u, char *name); static void job_postfork_test_user(job_t j); static void job_log_pids_with_weird_uids(job_t j); static void job_force_sampletool(job_t j); @@ -3355,6 +3356,8 @@ desired_gid = gre->gr_gid; } + job_enable_audit_for_user(j, desired_uid, loginname); + if (!job_assumes(j, setlogin(loginname) != -1)) { _exit(EXIT_FAILURE); } @@ -3391,6 +3394,28 @@ } void +job_enable_audit_for_user(job_t j, uid_t u, char *name) +{ + auditinfo_t auinfo = { + .ai_auid = u, + .ai_asid = j->p, + }; + long au_cond; + + if (!job_assumes(j, auditon(A_GETCOND, &au_cond, sizeof(long)) == 0)) { + _exit(EXIT_FAILURE); + } + + if (au_cond != AUC_NOAUDIT) { + if (!job_assumes(j, au_user_mask(name, &auinfo.ai_mask) == 0)) { + _exit(EXIT_FAILURE); + } else if (!job_assumes(j, setaudit(&auinfo) == 0)) { + _exit(EXIT_FAILURE); + } + } +} + +void job_setup_attributes(job_t j) { struct limititem *li;

1 0

[23658] branches/PR-5923864/
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23658 http://trac.macosforge.org/projects/launchd/changeset/23658 Author: dsorresso(a)apple.com Date: 2008-08-14 12:17:25 -0700 (Thu, 14 Aug 2008) Log Message: ----------- "Branch for PR-5923864 from https://svn.macosforge.org/repository/launchd/branches/PR-5986602" Added Paths: ----------- branches/PR-5923864/ Copied: branches/PR-5923864 (from rev 23657, branches/PR-5986602)

1 0

[23657] branches/PR-5986602/
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23657 http://trac.macosforge.org/projects/launchd/changeset/23657 Author: dsorresso(a)apple.com Date: 2008-08-14 10:21:01 -0700 (Thu, 14 Aug 2008) Log Message: ----------- "Branch for PR-5986602 from https://svn.macosforge.org/repository/launchd/branches/PR-5977502" Added Paths: ----------- branches/PR-5986602/ Copied: branches/PR-5986602 (from rev 23656, branches/PR-5977502)

1 0

[23656] branches/PR-5977502/launchd/src/rc.netboot
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23656 http://trac.macosforge.org/projects/launchd/changeset/23656 Author: dsorresso(a)apple.com Date: 2008-08-13 18:25:40 -0700 (Wed, 13 Aug 2008) Log Message: ----------- Committing Dave's patch to rc.netboot. Modified Paths: -------------- branches/PR-5977502/launchd/src/rc.netboot Modified: branches/PR-5977502/launchd/src/rc.netboot =================================================================== --- branches/PR-5977502/launchd/src/rc.netboot 2008-08-14 01:21:27 UTC (rev 23655) +++ branches/PR-5977502/launchd/src/rc.netboot 2008-08-14 01:25:40 UTC (rev 23656) @@ -1,6 +1,6 @@ #!/bin/sh ## -# Copyright 2002 Apple Computer, Inc. +# Copyright 2002-2008 Apple Inc. # # This script configures NetBoot ## @@ -105,7 +105,11 @@ return 1 fi case "${mount_from}" in - afp:*) fstype=afp;; + afp:*) + fstype=afp + kextload /System/Library/Filesystems/AppleShare/asp_tcp.kext + kextload /System/Library/Filesystems/AppleShare/afpfs.kext + ;; nfs:*) fstype=nfs;; *) echo "unknown network filesystem mount from ${mount_from}" return 1

1 0

[23655] branches/PR-5977502/
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23655 http://trac.macosforge.org/projects/launchd/changeset/23655 Author: dsorresso(a)apple.com Date: 2008-08-13 18:21:27 -0700 (Wed, 13 Aug 2008) Log Message: ----------- "Branch for PR-5977502 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-5977502/ Copied: branches/PR-5977502 (from rev 23654, trunk)

1 0

[23654] branches/PR-5978442/launchd/src/liblaunch.c
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23654 http://trac.macosforge.org/projects/launchd/changeset/23654 Author: dsorresso(a)apple.com Date: 2008-08-13 18:16:16 -0700 (Wed, 13 Aug 2008) Log Message: ----------- Changed total_data_len to node_data_len to make it more obvious what's going on. Fixed a potential pointer math problem. Modified Paths: -------------- branches/PR-5978442/launchd/src/liblaunch.c Modified: branches/PR-5978442/launchd/src/liblaunch.c =================================================================== --- branches/PR-5978442/launchd/src/liblaunch.c 2008-08-13 23:53:14 UTC (rev 23653) +++ branches/PR-5978442/launchd/src/liblaunch.c 2008-08-14 01:16:16 UTC (rev 23654) @@ -608,13 +608,13 @@ launch_data_pack(launch_data_t d, void *where, size_t len, int *fd_where, size_t *fd_cnt) { launch_data_t o_in_w = where; - size_t i, rsz, total_data_len = sizeof(struct _launch_data); + size_t i, rsz, node_data_len = sizeof(struct _launch_data); - if (total_data_len > len) { + if (node_data_len > len) { return 0; } - where += total_data_len; + where += node_data_len; o_in_w->type = host2wire(d->type); @@ -641,55 +641,55 @@ break; case LAUNCH_DATA_STRING: o_in_w->string_len = host2wire(d->string_len); - total_data_len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1); + node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1); - if (total_data_len > len) { + if (node_data_len > len) { return 0; } - memcpy(where, d->string, strlen(d->string) + 1); + memcpy(where, d->string, d->string_len + 1); /* Zero padded data. */ - pad_len = total_data_len - d->string_len; - bzero(o_in_w + d->string_len + 1, pad_len); + pad_len = ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1) - (d->string_len + 1); + bzero(where + d->string_len + 1, pad_len); break; case LAUNCH_DATA_OPAQUE: o_in_w->opaque_size = host2wire(d->opaque_size); - total_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); - if (total_data_len > len) { + node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); + if (node_data_len > len) { return 0; } memcpy(where, d->opaque, d->opaque_size); /* Zero padded data. */ - pad_len = total_data_len - d->opaque_size; - bzero(o_in_w + d->opaque_size, pad_len); + pad_len = ROUND_TO_64BIT_WORD_SIZE(d->opaque_size) - d->opaque_size; + bzero(where + d->opaque_size, pad_len); break; case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: o_in_w->_array_cnt = host2wire(d->_array_cnt); - total_data_len += d->_array_cnt * sizeof(uint64_t); - if (total_data_len > len) { + node_data_len += d->_array_cnt * sizeof(uint64_t); + if (node_data_len > len) { return 0; } where += d->_array_cnt * sizeof(uint64_t); for (i = 0; i < d->_array_cnt; i++) { - rsz = launch_data_pack(d->_array[i], where, len - total_data_len, fd_where, fd_cnt); + rsz = launch_data_pack(d->_array[i], where, len - node_data_len, fd_where, fd_cnt); if (rsz == 0) { return 0; } where += rsz; - total_data_len += rsz; + node_data_len += rsz; } break; default: break; } - return total_data_len; + return node_data_len; } launch_data_t

1 0

[23653] branches/PR-5978442/launchd/src/liblaunch.c
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 23653 http://trac.macosforge.org/projects/launchd/changeset/23653 Author: dsorresso(a)apple.com Date: 2008-08-13 16:53:14 -0700 (Wed, 13 Aug 2008) Log Message: ----------- One more time with proper bzero() call. Modified Paths: -------------- branches/PR-5978442/launchd/src/liblaunch.c Modified: branches/PR-5978442/launchd/src/liblaunch.c =================================================================== --- branches/PR-5978442/launchd/src/liblaunch.c 2008-08-13 18:23:02 UTC (rev 23652) +++ branches/PR-5978442/launchd/src/liblaunch.c 2008-08-13 23:53:14 UTC (rev 23653) @@ -618,6 +618,7 @@ o_in_w->type = host2wire(d->type); + size_t pad_len = 0; switch (d->type) { case LAUNCH_DATA_INTEGER: o_in_w->number = host2wire(d->number); @@ -648,7 +649,8 @@ memcpy(where, d->string, strlen(d->string) + 1); /* Zero padded data. */ - bzero(o_in_w + (total_data_len - len)); + pad_len = total_data_len - d->string_len; + bzero(o_in_w + d->string_len + 1, pad_len); break; case LAUNCH_DATA_OPAQUE: @@ -660,7 +662,8 @@ memcpy(where, d->opaque, d->opaque_size); /* Zero padded data. */ - bzero(o_in_w + (total_data_len - len)); + pad_len = total_data_len - d->opaque_size; + bzero(o_in_w + d->opaque_size, pad_len); break; case LAUNCH_DATA_DICTIONARY:

1 0

[23652] branches/PR-5978442/launchd/src/liblaunch.c
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 23652 http://trac.macosforge.org/projects/launchd/changeset/23652 Author: dsorresso(a)apple.com Date: 2008-08-13 11:23:02 -0700 (Wed, 13 Aug 2008) Log Message: ----------- How about we not page in 10 MB every time we send a Mach message ... Modified Paths: -------------- branches/PR-5978442/launchd/src/liblaunch.c Modified: branches/PR-5978442/launchd/src/liblaunch.c =================================================================== --- branches/PR-5978442/launchd/src/liblaunch.c 2008-08-13 01:41:23 UTC (rev 23651) +++ branches/PR-5978442/launchd/src/liblaunch.c 2008-08-13 18:23:02 UTC (rev 23652) @@ -641,10 +641,15 @@ case LAUNCH_DATA_STRING: o_in_w->string_len = host2wire(d->string_len); total_data_len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1); + if (total_data_len > len) { return 0; } memcpy(where, d->string, strlen(d->string) + 1); + + /* Zero padded data. */ + bzero(o_in_w + (total_data_len - len)); + break; case LAUNCH_DATA_OPAQUE: o_in_w->opaque_size = host2wire(d->opaque_size); @@ -653,6 +658,10 @@ return 0; } memcpy(where, d->opaque, d->opaque_size); + + /* Zero padded data. */ + bzero(o_in_w + (total_data_len - len)); + break; case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: @@ -779,7 +788,7 @@ /* hack, see the above assert to verify "correctness" */ free(lh->sendbuf); - lh->sendbuf = calloc(1, good_enough_size); + lh->sendbuf = malloc(good_enough_size); free(lh->sendfds); lh->sendfds = malloc(4 * 1024);

1 0

[23651] branches/PR-5978442/launchd/src/liblaunch.c
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 23651 http://trac.macosforge.org/projects/launchd/changeset/23651 Author: dsorresso(a)apple.com Date: 2008-08-12 18:41:23 -0700 (Tue, 12 Aug 2008) Log Message: ----------- Fix for rdar://problem/5978442: calloc(3)ing instead of malloc(3)ing. Modified Paths: -------------- branches/PR-5978442/launchd/src/liblaunch.c Modified: branches/PR-5978442/launchd/src/liblaunch.c =================================================================== --- branches/PR-5978442/launchd/src/liblaunch.c 2008-08-07 23:19:55 UTC (rev 23650) +++ branches/PR-5978442/launchd/src/liblaunch.c 2008-08-13 01:41:23 UTC (rev 23651) @@ -779,7 +779,7 @@ /* hack, see the above assert to verify "correctness" */ free(lh->sendbuf); - lh->sendbuf = malloc(good_enough_size); + lh->sendbuf = calloc(1, good_enough_size); free(lh->sendfds); lh->sendfds = malloc(4 * 1024);

1 0

[23650] branches/PR-5978442/
by source_changes＠macosforge.org 07 Aug '08

07 Aug '08

Revision: 23650 http://trac.macosforge.org/projects/launchd/changeset/23650 Author: dsorresso(a)apple.com Date: 2008-08-07 16:19:55 -0700 (Thu, 07 Aug 2008) Log Message: ----------- "Branch for PR-5978442 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-5978442/ Copied: branches/PR-5978442 (from rev 23649, trunk)

1 0