|
| 1 | + BASH PATCH REPORT |
| 2 | + ================= |
| 3 | + |
| 4 | +Bash-Release: 4.4 |
| 5 | +Patch-ID: bash44-020 |
| 6 | + |
| 7 | +Bug-Reported-by: Graham Northup < [email protected]> |
| 8 | +Bug-Reference-ID: < [email protected]> |
| 9 | +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00025.html |
| 10 | + |
| 11 | +Bug-Description: |
| 12 | + |
| 13 | +In circumstances involving long-running scripts that create and reap many |
| 14 | +processes, it is possible for the hash table bash uses to store exit |
| 15 | +statuses from asynchronous processes to develop loops. This patch fixes |
| 16 | +the loop causes and adds code to detect any future loops. |
| 17 | + |
| 18 | +Patch (apply with `patch -p0'): |
| 19 | + |
| 20 | +*** ../bash-4.4-patched/jobs.c 2016-11-11 13:42:55.000000000 -0500 |
| 21 | +--- jobs.c 2017-02-22 15:16:28.000000000 -0500 |
| 22 | +*************** |
| 23 | +*** 813,818 **** |
| 24 | + struct pidstat *ps; |
| 25 | + |
| 26 | +! bucket = pshash_getbucket (pid); |
| 27 | +! psi = bgp_getindex (); |
| 28 | + ps = &bgpids.storage[psi]; |
| 29 | + |
| 30 | +--- 796,815 ---- |
| 31 | + struct pidstat *ps; |
| 32 | + |
| 33 | +! /* bucket == existing chain of pids hashing to same value |
| 34 | +! psi = where were going to put this pid/status */ |
| 35 | +! |
| 36 | +! bucket = pshash_getbucket (pid); /* index into pidstat_table */ |
| 37 | +! psi = bgp_getindex (); /* bgpids.head, index into storage */ |
| 38 | +! |
| 39 | +! /* XXX - what if psi == *bucket? */ |
| 40 | +! if (psi == *bucket) |
| 41 | +! { |
| 42 | +! #ifdef DEBUG |
| 43 | +! internal_warning ("hashed pid %d (pid %d) collides with bgpids.head, skipping", psi, pid); |
| 44 | +! #endif |
| 45 | +! bgpids.storage[psi].pid = NO_PID; /* make sure */ |
| 46 | +! psi = bgp_getindex (); /* skip to next one */ |
| 47 | +! } |
| 48 | +! |
| 49 | + ps = &bgpids.storage[psi]; |
| 50 | + |
| 51 | +*************** |
| 52 | +*** 842,845 **** |
| 53 | +--- 839,843 ---- |
| 54 | + { |
| 55 | + struct pidstat *ps; |
| 56 | ++ ps_index_t *bucket; |
| 57 | + |
| 58 | + ps = &bgpids.storage[psi]; |
| 59 | +*************** |
| 60 | +*** 847,856 **** |
| 61 | + return; |
| 62 | + |
| 63 | +! if (ps->bucket_next != NO_PID) |
| 64 | + bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; |
| 65 | +! if (ps->bucket_prev != NO_PID) |
| 66 | + bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; |
| 67 | + else |
| 68 | +! *(pshash_getbucket (ps->pid)) = ps->bucket_next; |
| 69 | + } |
| 70 | + |
| 71 | +--- 845,861 ---- |
| 72 | + return; |
| 73 | + |
| 74 | +! if (ps->bucket_next != NO_PIDSTAT) |
| 75 | + bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; |
| 76 | +! if (ps->bucket_prev != NO_PIDSTAT) |
| 77 | + bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; |
| 78 | + else |
| 79 | +! { |
| 80 | +! bucket = pshash_getbucket (ps->pid); |
| 81 | +! *bucket = ps->bucket_next; /* deleting chain head in hash table */ |
| 82 | +! } |
| 83 | +! |
| 84 | +! /* clear out this cell, just in case */ |
| 85 | +! ps->pid = NO_PID; |
| 86 | +! ps->bucket_next = ps->bucket_prev = NO_PIDSTAT; |
| 87 | + } |
| 88 | + |
| 89 | +*************** |
| 90 | +*** 859,863 **** |
| 91 | + pid_t pid; |
| 92 | + { |
| 93 | +! ps_index_t psi; |
| 94 | + |
| 95 | + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) |
| 96 | +--- 864,868 ---- |
| 97 | + pid_t pid; |
| 98 | + { |
| 99 | +! ps_index_t psi, orig_psi; |
| 100 | + |
| 101 | + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) |
| 102 | +*************** |
| 103 | +*** 865,871 **** |
| 104 | + |
| 105 | + /* Search chain using hash to find bucket in pidstat_table */ |
| 106 | +! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) |
| 107 | +! if (bgpids.storage[psi].pid == pid) |
| 108 | +! break; |
| 109 | + |
| 110 | + if (psi == NO_PIDSTAT) |
| 111 | +--- 870,883 ---- |
| 112 | + |
| 113 | + /* Search chain using hash to find bucket in pidstat_table */ |
| 114 | +! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) |
| 115 | +! { |
| 116 | +! if (bgpids.storage[psi].pid == pid) |
| 117 | +! break; |
| 118 | +! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ |
| 119 | +! { |
| 120 | +! internal_warning ("bgp_delete: LOOP: psi (%d) == storage[psi].bucket_next", psi); |
| 121 | +! return 0; |
| 122 | +! } |
| 123 | +! } |
| 124 | + |
| 125 | + if (psi == NO_PIDSTAT) |
| 126 | +*************** |
| 127 | +*** 905,909 **** |
| 128 | + pid_t pid; |
| 129 | + { |
| 130 | +! ps_index_t psi; |
| 131 | + |
| 132 | + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) |
| 133 | +--- 917,921 ---- |
| 134 | + pid_t pid; |
| 135 | + { |
| 136 | +! ps_index_t psi, orig_psi; |
| 137 | + |
| 138 | + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) |
| 139 | +*************** |
| 140 | +*** 911,917 **** |
| 141 | + |
| 142 | + /* Search chain using hash to find bucket in pidstat_table */ |
| 143 | +! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) |
| 144 | +! if (bgpids.storage[psi].pid == pid) |
| 145 | +! return (bgpids.storage[psi].status); |
| 146 | + |
| 147 | + return -1; |
| 148 | +--- 923,936 ---- |
| 149 | + |
| 150 | + /* Search chain using hash to find bucket in pidstat_table */ |
| 151 | +! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) |
| 152 | +! { |
| 153 | +! if (bgpids.storage[psi].pid == pid) |
| 154 | +! return (bgpids.storage[psi].status); |
| 155 | +! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ |
| 156 | +! { |
| 157 | +! internal_warning ("bgp_search: LOOP: psi (%d) == storage[psi].bucket_next", psi); |
| 158 | +! return -1; |
| 159 | +! } |
| 160 | +! } |
| 161 | + |
| 162 | + return -1; |
| 163 | +*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 |
| 164 | +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 |
| 165 | +*************** |
| 166 | +*** 26,30 **** |
| 167 | + looks for to find the patch level (for the sccs version string). */ |
| 168 | + |
| 169 | +! #define PATCHLEVEL 19 |
| 170 | + |
| 171 | + #endif /* _PATCHLEVEL_H_ */ |
| 172 | +--- 26,30 ---- |
| 173 | + looks for to find the patch level (for the sccs version string). */ |
| 174 | + |
| 175 | +! #define PATCHLEVEL 20 |
| 176 | + |
| 177 | + #endif /* _PATCHLEVEL_H_ */ |
0 commit comments