diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/msg.c | 12 | ||||
-rw-r--r-- | ipc/util.c | 4 |
2 files changed, 8 insertions, 8 deletions
@@ -345,19 +345,19 @@ copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version) | |||
345 | out.msg_rtime = in->msg_rtime; | 345 | out.msg_rtime = in->msg_rtime; |
346 | out.msg_ctime = in->msg_ctime; | 346 | out.msg_ctime = in->msg_ctime; |
347 | 347 | ||
348 | if (in->msg_cbytes > USHORT_MAX) | 348 | if (in->msg_cbytes > USHRT_MAX) |
349 | out.msg_cbytes = USHORT_MAX; | 349 | out.msg_cbytes = USHRT_MAX; |
350 | else | 350 | else |
351 | out.msg_cbytes = in->msg_cbytes; | 351 | out.msg_cbytes = in->msg_cbytes; |
352 | out.msg_lcbytes = in->msg_cbytes; | 352 | out.msg_lcbytes = in->msg_cbytes; |
353 | 353 | ||
354 | if (in->msg_qnum > USHORT_MAX) | 354 | if (in->msg_qnum > USHRT_MAX) |
355 | out.msg_qnum = USHORT_MAX; | 355 | out.msg_qnum = USHRT_MAX; |
356 | else | 356 | else |
357 | out.msg_qnum = in->msg_qnum; | 357 | out.msg_qnum = in->msg_qnum; |
358 | 358 | ||
359 | if (in->msg_qbytes > USHORT_MAX) | 359 | if (in->msg_qbytes > USHRT_MAX) |
360 | out.msg_qbytes = USHORT_MAX; | 360 | out.msg_qbytes = USHRT_MAX; |
361 | else | 361 | else |
362 | out.msg_qbytes = in->msg_qbytes; | 362 | out.msg_qbytes = in->msg_qbytes; |
363 | out.msg_lqbytes = in->msg_qbytes; | 363 | out.msg_lqbytes = in->msg_qbytes; |
diff --git a/ipc/util.c b/ipc/util.c index 79ce84e890f7..69a0cc13d966 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -124,8 +124,8 @@ void ipc_init_ids(struct ipc_ids *ids) | |||
124 | ids->seq = 0; | 124 | ids->seq = 0; |
125 | { | 125 | { |
126 | int seq_limit = INT_MAX/SEQ_MULTIPLIER; | 126 | int seq_limit = INT_MAX/SEQ_MULTIPLIER; |
127 | if (seq_limit > USHORT_MAX) | 127 | if (seq_limit > USHRT_MAX) |
128 | ids->seq_max = USHORT_MAX; | 128 | ids->seq_max = USHRT_MAX; |
129 | else | 129 | else |
130 | ids->seq_max = seq_limit; | 130 | ids->seq_max = seq_limit; |
131 | } | 131 | } |